From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 16 Jan 2024 08:53:48 +0000 (+0100)
Subject: efi/x86: Set the PE/COFF header's NX compat flag unconditionally
X-Git-Tag: v6.9-rc1~181^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=891f8890a4a3663da7056542757022870b499bc1;p=thirdparty%2Fkernel%2Flinux.git

efi/x86: Set the PE/COFF header's NX compat flag unconditionally

Now that the proper section and file alignment is used, and the EFI
memory attributes protocol to manage executable permissions where needed
is invoked, set the NX compat flag unconditionally.

  [ bp: Remove the "we"s. ]

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240116085347.2193966-2-ardb+git@google.com
---

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index a1bbedd989e42..b5c79f43359bc 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -111,11 +111,7 @@ extra_header_fields:
 	.long	salign				# SizeOfHeaders
 	.long	0				# CheckSum
 	.word	IMAGE_SUBSYSTEM_EFI_APPLICATION	# Subsystem (EFI application)
-#ifdef CONFIG_EFI_DXE_MEM_ATTRIBUTES
 	.word	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	# DllCharacteristics
-#else
-	.word	0				# DllCharacteristics
-#endif
 #ifdef CONFIG_X86_32
 	.long	0				# SizeOfStackReserve
 	.long	0				# SizeOfStackCommit