Skip to content

Commit df7ecce

Browse files
committed
x86/efistub: Don't clear BSS twice in mixed mode
Clearing BSS should only be done once, at the very beginning. efi_pe_entry() is the entrypoint from the firmware, which may not clear BSS and so it is done explicitly. However, efi_pe_entry() is also used as an entrypoint by the mixed mode startup code, in which case BSS will already have been cleared, and doing it again at this point will corrupt global variables holding the firmware's GDT/IDT and segment selectors. So make the memset() conditional on whether the EFI stub is running in native mode. Fixes: b3810c5 ("x86/efistub: Clear decompressor BSS in native EFI entrypoint") Signed-off-by: Ard Biesheuvel <[email protected]>
1 parent cefcd4f commit df7ecce

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/firmware/efi/libstub/x86-stub.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,8 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
476476
efi_status_t status;
477477
char *cmdline_ptr;
478478

479-
memset(_bss, 0, _ebss - _bss);
479+
if (efi_is_native())
480+
memset(_bss, 0, _ebss - _bss);
480481

481482
efi_system_table = sys_table_arg;
482483

0 commit comments

Comments
 (0)