c85662cbfa
- Merge changes from SLE12
- add grub2-emu-4-all.patch
* Build 'grub2-emu' wherever possible, to allow a better
implementation of that feature.
- add grub2-s390x-06-loadparm.patch,
- add grub2-commands-introduce-read_file-subcommand.patch:
* allow s390x to telecontrol grub2. (bsc#891946, bsc#892852)
- add grub2-s390x-06-loadparm.patch:
* ignore case and fix transliteration of parameter. (bsc#891946)
- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
* Add --image switch to force zipl update to specific kernel
(bsc#928131)
- add grub2-s390x-08-workaround-part-to-disk.patch
* Ignore partition tables on s390x. (bsc#935127)
- add grub2-efi-chainload-harder.patch:
* allow XEN to be chain-loaded despite firmware flaws. (bnc#887793)
* Do not use shim lock protocol for reading pe header, it won't be
available when secure boot disabled (bsc#943380)
* Make firmware flaw condition be more precisely detected and add
debug message for the case
* Check msdos header to find PE file header (bsc#954126)
- grub2-s390x-04-grub2-install.patch:
* streamline boot to grub menu. (bsc#898198)
* Force '/usr' to read-only before calling kexec. (bsc#932951)
- grub2-once:
* add '--enum' option to enumerate boot-entries in a way
actually understood by 'grub2'. (bsc#892852, bsc#892811)
* Examine variables from grub environment in 'grub2-once'. (fate#319632)
OBS-URL: https://build.opensuse.org/request/show/457610
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=254
104 lines
3.7 KiB
Diff
104 lines
3.7 KiB
Diff
---
|
|
grub-core/loader/efi/chainloader.c | 62 +++++++++++++++++++++----------------
|
|
1 file changed, 36 insertions(+), 26 deletions(-)
|
|
|
|
Index: grub-2.02~beta2/grub-core/loader/efi/chainloader.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/loader/efi/chainloader.c
|
|
+++ grub-2.02~beta2/grub-core/loader/efi/chainloader.c
|
|
@@ -326,40 +326,41 @@ grub_secure_mode (void)
|
|
static grub_efi_boolean_t
|
|
read_header (void *data, grub_efi_uint32_t size, pe_coff_loader_image_context_t *context)
|
|
{
|
|
- grub_efi_guid_t guid = SHIM_LOCK_GUID;
|
|
- grub_efi_shim_lock_t *shim_lock;
|
|
- grub_efi_status_t status;
|
|
-
|
|
- shim_lock = grub_efi_locate_protocol (&guid, NULL);
|
|
+ char *msdos = (char *)data;
|
|
+ struct grub_pe32_header_no_msdos_stub *pe32 = (struct grub_pe32_header_no_msdos_stub *)data;
|
|
|
|
- if (!shim_lock)
|
|
+ if (size < sizeof (*pe32))
|
|
{
|
|
- grub_error (GRUB_ERR_BAD_ARGUMENT, "no shim lock protocol");
|
|
+ grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid image");
|
|
return 0;
|
|
}
|
|
|
|
- status = shim_lock->context (data, size, context);
|
|
-
|
|
- if (status == GRUB_EFI_SUCCESS)
|
|
+ if (grub_memcmp (msdos, "MZ", 2) == 0)
|
|
{
|
|
- grub_dprintf ("chain", "context success\n");
|
|
- return 1;
|
|
+ grub_uint32_t off = *((grub_uint32_t *) (msdos + 0x3c));
|
|
+ pe32 = (struct grub_pe32_header_no_msdos_stub *) ((char *)data + off);
|
|
}
|
|
|
|
- switch (status)
|
|
+ if (grub_memcmp (pe32->signature, "PE\0\0", 4) != 0 ||
|
|
+ pe32->coff_header.machine != GRUB_PE32_MACHINE_X86_64 ||
|
|
+ pe32->optional_header.magic != GRUB_PE32_PE64_MAGIC)
|
|
{
|
|
- case GRUB_EFI_UNSUPPORTED:
|
|
- grub_error (GRUB_ERR_BAD_ARGUMENT, "context error unsupported");
|
|
- break;
|
|
- case GRUB_EFI_INVALID_PARAMETER:
|
|
- grub_error (GRUB_ERR_BAD_ARGUMENT, "context error invalid parameter");
|
|
- break;
|
|
- default:
|
|
- grub_error (GRUB_ERR_BAD_ARGUMENT, "context error code");
|
|
- break;
|
|
+ grub_error (GRUB_ERR_BAD_ARGUMENT, "Not supported image");
|
|
+ return 0;
|
|
}
|
|
|
|
- return 0;
|
|
+ context->number_of_rva_and_sizes = pe32->optional_header.num_data_directories;
|
|
+ context->size_of_headers = pe32->optional_header.header_size;
|
|
+ context->image_size = pe32->optional_header.image_size;
|
|
+ context->image_address = pe32->optional_header.image_base;
|
|
+ context->entry_point = pe32->optional_header.entry_addr;
|
|
+ context->reloc_dir = &pe32->optional_header.base_relocation_table;
|
|
+ context->sec_dir = &pe32->optional_header.certificate_table;
|
|
+ context->number_of_sections = pe32->coff_header.num_sections;
|
|
+ context->pe_hdr = pe32;
|
|
+ context->first_section = (struct grub_pe32_section_table *)((char *)(&pe32->optional_header) + pe32->coff_header.optional_header_size);
|
|
+
|
|
+ return 1;
|
|
}
|
|
|
|
static void*
|
|
@@ -623,6 +624,9 @@ error_exit:
|
|
if (buffer)
|
|
efi_call_1 (b->free_pool, buffer);
|
|
|
|
+ if (grub_errno)
|
|
+ grub_print_error ();
|
|
+
|
|
return 0;
|
|
|
|
}
|
|
@@ -845,6 +849,19 @@ grub_cmd_chainloader (grub_command_t cmd
|
|
status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
|
|
boot_image, fsize,
|
|
&image_handle);
|
|
+#ifdef SUPPORT_SECURE_BOOT
|
|
+ if (status == GRUB_EFI_SECURITY_VIOLATION && !grub_secure_mode())
|
|
+ {
|
|
+ /* If it failed with security violation while not in secure boot mode,
|
|
+ the firmware might be broken. We try to workaround on that by forcing
|
|
+ the SB method! (bsc#887793) */
|
|
+ grub_dprintf ("chain", "Possible firmware flaw! Security violation while not in secure boot mode.\n");
|
|
+ grub_file_close (file);
|
|
+ grub_loader_set (grub_secureboot_chainloader_boot,
|
|
+ grub_secureboot_chainloader_unload, 0);
|
|
+ return 0;
|
|
+ }
|
|
+#endif
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
{
|
|
if (status == GRUB_EFI_OUT_OF_RESOURCES)
|