Merge ~xnox/grub:do-not-finalize-twice into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

grub_err_t
grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
{
...
  retval = finalize_params_linux ();
...
}

static grub_err_t
grub_linux_boot (void)
{
  if (finalize_params_linux () != GRUB_ERR_NONE)
    return grub_errno;

  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
                                          kernel_size, linux_args));
}

Calling finalize_params_linux () twice doesn't do anything good. Drop calling that in grub_linux_boot, since grub_arch_efi_linux_boot_image calls that already.

As we have observed loading fdt twice, corrupts things, on certain hardware.

[Łukasz Zemczak (sil2100)]

Oh! Ok, looking at the code, this new change makes sense. Since I see Julian already does finalize_params_linux () in grub_arch_efi_linux_boot_image() indeed. I feel like this fix is very straightforward.

review: Approve

[Julian Andres Klode (juliank)]

Sounds right

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index fa79372..63f5a6e 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-de16b027e2e63f3ef4852fff6433bd009a364731
-de16b027e2e63f3ef4852fff6433bd009a364731
+26335cb229a6b969449f80dc6c5aed949ee1d86c
+26335cb229a6b969449f80dc6c5aed949ee1d86c
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 3d6e540..3b0ce0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ grub2 (2.04-1ubuntu35) UNRELEASED; urgency=medium
   * postinst.in, grub-multi-install: fix logic of skipping installing onto
     any device, if one chose to not install bootloader on any device. LP:
     #1896608
+  * Do not finalize params twice on arm64. LP: #1897819
 
  -- Dimitri John Ledkov <[e-mail]>  Mon, 28 Sep 2020 14:05:26 +0100
 
diff --git a/debian/patches/ubuntu-dejavu-font-path.patch b/debian/patches/ubuntu-dejavu-font-path.patch
index 539ce34..1faea8d 100644
--- a/debian/patches/ubuntu-dejavu-font-path.patch
+++ b/debian/patches/ubuntu-dejavu-font-path.patch
@@ -1,4 +1,4 @@
-From de16b027e2e63f3ef4852fff6433bd009a364731 Mon Sep 17 00:00:00 2001
+From 26335cb229a6b969449f80dc6c5aed949ee1d86c Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <[e-mail]>
 Date: Mon, 14 Sep 2020 10:51:32 +0100
 Subject: configure.ac: one more dejavu font search path
diff --git a/debian/patches/ubuntu-linuxefi-arm64.patch b/debian/patches/ubuntu-linuxefi-arm64.patch
index 6086de2..dd7c9e9 100644
--- a/debian/patches/ubuntu-linuxefi-arm64.patch
+++ b/debian/patches/ubuntu-linuxefi-arm64.patch
@@ -1,4 +1,4 @@
-From ea1b168fb36e6819f9ad435d16d9dd2f91d75b42 Mon Sep 17 00:00:00 2001
+From f38282a2ced47589ab05b2184a57d87cbbd7db40 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <[e-mail]>
 Date: Fri, 11 Sep 2020 11:28:08 +0200
 Subject: Cherry-pick back parts of "Load arm with SB enabled."
@@ -13,11 +13,11 @@ Bug-Ubuntu: https://bugs.launchpad.net/1862279
 Origin: vendor, https://github.com/rhboot/grub2/commit/2786ab864cf00c15123320671f653e9a36ba12b4
 Patch-Name: ubuntu-linuxefi-arm64.patch
 ---
- grub-core/loader/arm64/linux.c | 103 ++++++++++++++++++---------------
- 1 file changed, 56 insertions(+), 47 deletions(-)
+ grub-core/loader/arm64/linux.c | 106 +++++++++++++++++----------------
+ 1 file changed, 56 insertions(+), 50 deletions(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 3f5496fc55..39ebcf5b52 100644
+index 3f5496fc55..130e9c09b4 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -43,6 +43,8 @@ static int loaded;
@@ -67,7 +67,7 @@ index 3f5496fc55..39ebcf5b52 100644
    return GRUB_ERR_NONE;
  
  failure:
-@@ -118,62 +142,43 @@ failure:
+@@ -118,70 +142,48 @@ failure:
    return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
  }
  
@@ -107,12 +107,12 @@ index 3f5496fc55..39ebcf5b52 100644
 -  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
 -  mempath[0].start_address = addr;
 -  mempath[0].end_address = addr + size;
--
++  grub_err_t retval;
+ 
 -  mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
 -  mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
 -  mempath[1].header.length = sizeof (grub_efi_device_path_t);
-+  grub_err_t retval;
- 
+-
 -  b = grub_efi_system_table->boot_services;
 -  status = b->load_image (0, grub_efi_image_handle,
 -			  (grub_efi_device_path_t *) mempath,
@@ -157,7 +157,15 @@ index 3f5496fc55..39ebcf5b52 100644
  }
  
  static grub_err_t
-@@ -297,6 +302,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ grub_linux_boot (void)
+ {
+-  if (finalize_params_linux () != GRUB_ERR_NONE)
+-    return grub_errno;
+-
+   return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
+                                           kernel_size, linux_args));
+ }
+@@ -297,6 +299,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  {
    grub_file_t file = 0;
    struct linux_arch_kernel_header lh;
@@ -165,7 +173,7 @@ index 3f5496fc55..39ebcf5b52 100644
    grub_err_t err;
    int rc;
  
-@@ -354,6 +360,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -354,6 +357,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
          }
      }
  
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index 39ebcf5..130e9c0 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -184,9 +184,6 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
 static grub_err_t
 grub_linux_boot (void)
 {
-  if (finalize_params_linux () != GRUB_ERR_NONE)
-    return grub_errno;
-
   return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
                                           kernel_size, linux_args));
 }