On Wed, 1 Jun 2022 at 13:51, Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> wrote:
>
> 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 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@xxxxxxxxx>
> ---
> Peter, please review and ack.
> Ard, please pick this fix-up patch.
>
Thanks, Lukas, I'll queue this up.
> arch/x86/boot/header.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
> index 0352e4589efa..f912d7770130 100644
> --- a/arch/x86/boot/header.S
> +++ b/arch/x86/boot/header.S
> @@ -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
> --
> 2.17.1
>
