File Use-device-part-of-chainloader-targ.patch of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File Use-device-part-of-chainloader-targ.patch of Package grub2

From: Raymund Will <rw@suse.com>
Date: Tue, 2 Jun 2020 17:33:39 +0800
Subject: [PATCH] Use device part of chainloader target, if present.

Otherwise chainloading is restricted to '$root', which might not even
be readable by EFI!

v1. use grub_file_get_device_name() to get device name

Signed-off-by: Michael Chang <mchang@suse.com>
---
 grub-core/loader/efi/chainloader.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index fe4ec02d8..625f1d26d 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -686,12 +686,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
       *(--p16) = 0;
     }
 
+  grub_dprintf ("chain", "cmd='%s'\n", filename);
   file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
   if (! file)
     goto fail;
 
-  /* Get the root device's device path.  */
-  dev = grub_device_open (0);
+  /* Get the device path from filename. */
+  char *devname = grub_file_get_device_name (filename);
+  dev = grub_device_open (devname);
+  if (devname)
+    grub_free (devname);
   if (! dev)
     goto fail;

Places

File Use-device-part-of-chainloader-targ.patch of Package grub2

Places