]> git.itanic.dy.fi Git - linux-stable/commit
x86/efistub: Don't clear BSS twice in mixed mode
authorArd Biesheuvel <ardb@kernel.org>
Fri, 22 Mar 2024 16:01:45 +0000 (17:01 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:17:39 +0000 (18:17 -0400)
commit245a7547fc09069029f9a45aafd96b8931cf2df9
treeb3d48571a61bcbb0bad1b6f3a86f34e35304c2d0
parent7d78b4798279ae8d265152e9f31ae72726c44ff1
x86/efistub: Don't clear BSS twice in mixed mode

[ Upstream commit df7ecce842b846a04d087ba85fdb79a90e26a1b0 ]

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: b3810c5a2cc4a666 ("x86/efistub: Clear decompressor BSS in native EFI entrypoint")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/efi/libstub/x86-stub.c