From: Arvind Sankar Date: Sun, 8 Mar 2020 08:08:48 +0000 (+0100) Subject: efi/x86: Add kernel preferred address to PE header X-Git-Tag: v5.7-rc1~182^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26725192c46e1e543ed86a06823fa591cd6faf58;p=thirdparty%2Fkernel%2Flinux.git efi/x86: Add kernel preferred address to PE header Store the kernel's link address as ImageBase in the PE header. Note that the PE specification requires the ImageBase to be 64k aligned. The preferred address should almost always satisfy that, except for 32-bit kernel if the configuration has been customized. Signed-off-by: Arvind Sankar Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20200303221205.4048668-4-nivedita@alum.mit.edu Link: https://lore.kernel.org/r/20200308080859.21568-18-ardb@kernel.org --- diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 4ee25e28996f6..735ad7f21ab08 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -138,10 +138,12 @@ optional_header: #endif extra_header_fields: + # PE specification requires ImageBase to be 64k aligned + .set image_base, (LOAD_PHYSICAL_ADDR + 0xffff) & ~0xffff #ifdef CONFIG_X86_32 - .long 0 # ImageBase + .long image_base # ImageBase #else - .quad 0 # ImageBase + .quad image_base # ImageBase #endif .long 0x20 # SectionAlignment .long 0x20 # FileAlignment