Commit 891f8890 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Borislav Petkov (AMD)
Browse files

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: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240116085347.2193966-2-ardb+git@google.com
parent 11e36b0f

arch/x86/boot/header.S

+0 −4
Original line number Diff line number Diff line
@@ -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