diff options
| author | Michael Brown <mcb30@ipxe.org> | 2023-05-05 12:51:09 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2023-05-05 12:51:09 +0100 |
| commit | fbd13e6c12882bb96f0ccc50935d9553cdb90612 (patch) | |
| tree | 75ad127fcee145480f7a686ee6f8190b60c3cadb | |
| parent | b635696253c4337dd6ece21ba2e65eb449518356 (diff) | |
| download | ipxe-shim2.zip ipxe-shim2.tar.gz ipxe-shim2.tar.bz2 | |
[efi] Allow currently selected image to be opened as "grub*.efi"shim2
Versions 15.4 and earlier of the UEFI shim are incapable of correctly
parsing the command line in order to extract the second stage loader
filename, and will always attempt to load "grubx64.efi" or equivalent.
Versions 15.3 and later of the UEFI shim are currently incapable of
loading a Linux kernel directly anyway, since the kernel does not
include SBAT metadata. These versions will require a genuine
shim-signed GRUB binary to be used as a crutch to assist shim in
loading a Linux kernel.
This leaves versions 15.2 and earlier of the UEFI shim (as currently
used in e.g. RHEL7) as being capable of directly loading a Linux
kernel, but incorrectly attempting to load it using the filename
"grubx64.efi" or equivalent. To support the bugs in these older
versions of the UEFI shim, allow the currently selected image to be
opened via any filename of the form "grub*.efi".
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/interface/efi/efi_file.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/interface/efi/efi_file.c b/src/interface/efi/efi_file.c index 673f902..266de4a 100644 --- a/src/interface/efi/efi_file.c +++ b/src/interface/efi/efi_file.c @@ -374,6 +374,7 @@ efi_file_open ( EFI_FILE_PROTOCOL *this, EFI_FILE_PROTOCOL **new, char buf[ wcslen ( wname ) + 1 /* NUL */ ]; struct image *image; char *name; + char *sep; /* Convert name to ASCII */ snprintf ( buf, sizeof ( buf ), "%ls", wname ); @@ -413,6 +414,16 @@ efi_file_open ( EFI_FILE_PROTOCOL *this, EFI_FILE_PROTOCOL **new, new ); } + /* Allow currently selected image to be opened as "grub*.efi", + * to work around buggy versions of the UEFI shim. + */ + if ( ( strncasecmp ( name, "grub", 4 ) == 0 ) && + ( ( sep = strrchr ( name, '.' ) ) != NULL ) && + ( strcasecmp ( sep, ".efi" ) == 0 ) && + ( ( image = image_find_selected() ) != NULL ) ) { + return efi_file_open_image ( image, wname, new ); + } + DBGC ( file, "EFIFILE %ls does not exist\n", wname ); return EFI_NOT_FOUND; } |