tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader/efi/linux: Use shim loader image handle where available

Browse Source 
Not reusing these handles will result in image measurements showing up
twice in the event log.

On the occasion add missing grub_free() call.

Signed-off-by: Mate Kukri <mate.kukri@canonical.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Mate Kukri 2025-07-08 21:21:17 +01:00 committed by Daniel Kiper
parent 1b9a84e63b
commit a0d4c94ef6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grub-core/loader/efi/linux.c
View File

@ -207,11 +207,20 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
mempath[1].header.length = sizeof (grub_efi_device_path_t);
image_handle = grub_efi_get_last_verified_image_handle ();
if (image_handle == NULL)
{
status = grub_efi_load_image (0, grub_efi_image_handle,
(grub_efi_device_path_t *) mempath,
(void *) addr, size, &image_handle);
if (status != GRUB_EFI_SUCCESS)
{
grub_free (mempath);
return grub_error (GRUB_ERR_BAD_OS, "cannot load image");
}
}
grub_free (mempath);
grub_dprintf ("linux", "linux command line: '%s'\n", args);