Merge ~juliank/grub/+git/ubuntu:ofnet-bootpath-parser-fix into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

[Mathieu Trudel-Lapierre (cyphermox)]

This was previously merged, marking it as such.

diff --git a/debian/.git-dpm b/debian/.git-dpm
index c215732..d954250 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-e501ac3fa71513f33d20e9b3d6ffbb8262274ea8
-e501ac3fa71513f33d20e9b3d6ffbb8262274ea8
+a6f3cf8f157b9f4d03229b007c94b9476b84a2d2
+a6f3cf8f157b9f4d03229b007c94b9476b84a2d2
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 grub2_2.02+dfsg1.orig.tar.xz
diff --git a/debian/patches/ofnet-init-structs-in-bootpath-parser.patch b/debian/patches/ofnet-init-structs-in-bootpath-parser.patch
new file mode 100644
index 0000000..cadd7bb
--- /dev/null
+++ b/debian/patches/ofnet-init-structs-in-bootpath-parser.patch
@@ -0,0 +1,39 @@
+From a6f3cf8f157b9f4d03229b007c94b9476b84a2d2 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Thu, 23 Aug 2018 13:25:30 +0200
+Subject: ofnet: Initialize structs in bootpath parser
+
+Code later on checks if variables inside the struct are
+0 to see if they have been set, like if there were addresses
+in the bootpath.
+
+The variables were not initialized however, so the check
+might suceed with uninitialized data, and a new interface
+with random addresses has been added. This caused a weird
+bug in Ubuntu, because when booting from network, we now
+had two interfaces with the same name, and net_default_mac
+pointed to the random one.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785859
+Signed-off-by: Julian Andres Klode <[e-mail]>
+Patch-Name: ofnet-init-structs-in-bootpath-parser.patch
+Forwarded: https://lists.gnu.org/archive/html/grub-devel/2018-08/msg00074.html
+---
+ grub-core/net/drivers/ieee1275/ofnet.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
+index a78d164db..3a753658b 100644
+--- a/grub-core/net/drivers/ieee1275/ofnet.c
++++ b/grub-core/net/drivers/ieee1275/ofnet.c
+@@ -154,8 +154,8 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
+   char *equal_char = 0;
+   grub_size_t field_counter = 0;
+ 
+-  grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
+-  grub_net_link_level_address_t hw_addr;
++  grub_net_network_level_address_t client_addr = {}, gateway_addr = {}, subnet_mask = {};
++  grub_net_link_level_address_t hw_addr = {};
+   grub_net_interface_flags_t flags = 0;
+   struct grub_net_network_level_interface *inter = NULL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 59c3476..d4f1079 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -86,3 +86,4 @@ bufio_sensible_block_sizes.patch
 shorter_version_info.patch
 skip_text_gfxpayload_where_not_supported.patch
 add-an-auto-nvram-option-to-grub-install.patch
+ofnet-init-structs-in-bootpath-parser.patch
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index a78d164..3a75365 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -154,8 +154,8 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
   char *equal_char = 0;
   grub_size_t field_counter = 0;
 
-  grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
-  grub_net_link_level_address_t hw_addr;
+  grub_net_network_level_address_t client_addr = {}, gateway_addr = {}, subnet_mask = {};
+  grub_net_link_level_address_t hw_addr = {};
   grub_net_interface_flags_t flags = 0;
   struct grub_net_network_level_interface *inter = NULL;