]> git.baikalelectronics.ru Git - kernel.git/commitdiff
efi: x86: Fix config name for setting the NX-compatibility flag in the PE header
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Wed, 1 Jun 2022 11:50:43 +0000 (13:50 +0200)
committerArd Biesheuvel <ardb@kernel.org>
Wed, 1 Jun 2022 12:07:48 +0000 (14:07 +0200)
Commit 21b68da7bf4a ("efi: x86: Set the NX-compatibility flag in the PE
header") intends to set the compatibility flag, i.e.,
IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, but this ifdef is actually dead as
the CONFIG_DXE_MEM_ATTRIBUTES Kconfig option does not exist.

The config is actually called EFI_DXE_MEM_ATTRIBUTES. Adjust the ifdef
to use the intended config name.

The issue was identified with ./scripts/checkkconfigsymbols.py.

Fixes: 21b68da7bf4a ("efi: x86: Set the NX-compatibility flag in the PE header")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20220601115043.7678-1-lukas.bulwahn@gmail.com
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
arch/x86/boot/header.S

index 0352e4589efa2e52636beb9ac169892cce41f619..f912d777013052eaddfcb3d0bca1efc154be5bdd 100644 (file)
@@ -163,7 +163,7 @@ extra_header_fields:
        .long   0x200                           # SizeOfHeaders
        .long   0                               # CheckSum
        .word   IMAGE_SUBSYSTEM_EFI_APPLICATION # Subsystem (EFI application)
-#ifdef CONFIG_DXE_MEM_ATTRIBUTES
+#ifdef CONFIG_EFI_DXE_MEM_ATTRIBUTES
        .word   IMAGE_DLL_CHARACTERISTICS_NX_COMPAT     # DllCharacteristics
 #else
        .word   0                               # DllCharacteristics