x86/efistub: Revert to heap allocated boot_params for PE entrypoint
PATCH 1/1 x86/efistub: Revert to heap allocated boot_params for PE entrypoint
From: Ard Biesheuvel <[email protected]>
This is a partial revert of commit
8117961d98f ("x86/efi: Disregard setup header of loaded image")
which triggers boot issues on older Dell laptops. As it turns out, switching back to a heap allocation for the struct boot_params constructed by the EFI stub work around this, even though it is unclear why.
Cc Christian Heusel <[email protected]>
Reported-by <mavrix#[email protected]>
Signed-off-by Ard Biesheuvel <[email protected]>
--- drivers/firmware/efi/libstub/x86-stub.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +15 -5
@@ -534,11 +534,12 @@ void __noreturn efi_stub_entry(efi_handle_t handle, efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,efi_system_table_t *sys_table_arg) { - static struct boot_params boot_params __page_aligned_bss; -struct setup_header *hdr = &boot_params.hdr;efi_guid_t proto =LOADED_IMAGE_PROTOCOL_GUID ; +struct boot_params *boot_params; +struct setup_header *hdr;int options_size =0 ;efi_status_t status; +unsigned long alloc;char *cmdline_ptr; efi_system_table = sys_table_arg;
@@ -553,6 +554,13 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,efi_exit (handle, status); } + status =efi_allocate_pages (sizeof (*boot_params), &alloc,ULONG_MAX ); +if (status !=EFI_SUCCESS ) +efi_exit (handle, status); + + boot_params =memset ((void *)alloc,0x0 ,sizeof (*boot_params)); + hdr = &boot_params->hdr; +/* Assign the setup_header fields that the kernel actually cares about */ hdr->root_flags =1 ; hdr->vid_mode =0xffff ;
@@ -562,13 +570,15 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,/* Convert unicode cmdline to ascii */ cmdline_ptr =efi_convert_cmdline (image, &options_size); -if (!cmdline_ptr) +if (!cmdline_ptr) { +efi_free (sizeof (*boot_params), alloc);efi_exit (handle,EFI_OUT_OF_RESOURCES ); + }efi_set_u64_split ((unsigned long )cmdline_ptr, &hdr->cmd_line_ptr, - &boot_params.ext_cmd_line_ptr); + &boot_params->ext_cmd_line_ptr); -efi_stub_entry (handle, sys_table_arg, &boot_params); +efi_stub_entry (handle, sys_table_arg, boot_params);/* not reached */ }
Signature · 1 line
2.45.2.1089.g2a221341d9-goog