Commit bfab35f5 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/efi: Drop alignment flags from PE section headers 



The section header flags for alignment are documented in the PE/COFF
spec as being applicable to PE object files only, not to PE executables
such as the Linux bzImage, so let's drop them from the PE header.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230912090051.4014114-20-ardb@google.com
parent 7e502622

arch/x86/boot/header.S

+4 −8
Original line number Diff line number Diff line
@@ -209,8 +209,7 @@ section_table: 
	.word	0				# NumberOfLineNumbers

	.long	IMAGE_SCN_CNT_CODE		| \

		IMAGE_SCN_MEM_READ		| \

		IMAGE_SCN_MEM_EXECUTE		| \

		IMAGE_SCN_ALIGN_16BYTES		# Characteristics

		IMAGE_SCN_MEM_EXECUTE		# Characteristics



	#

	# The EFI application loader requires a relocation section
@@ -230,8 +229,7 @@ section_table: 
	.word	0				# NumberOfLineNumbers

	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \

		IMAGE_SCN_MEM_READ		| \

		IMAGE_SCN_MEM_DISCARDABLE	| \

		IMAGE_SCN_ALIGN_1BYTES		# Characteristics

		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics



#ifdef CONFIG_EFI_MIXED

	#
@@ -249,8 +247,7 @@ section_table: 
	.word	0				# NumberOfLineNumbers

	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \

		IMAGE_SCN_MEM_READ		| \

		IMAGE_SCN_MEM_DISCARDABLE	| \

		IMAGE_SCN_ALIGN_1BYTES		# Characteristics

		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics

#endif



	#
@@ -271,8 +268,7 @@ section_table: 
	.word	0				# NumberOfLineNumbers

	.long	IMAGE_SCN_CNT_CODE		| \

		IMAGE_SCN_MEM_READ		| \

		IMAGE_SCN_MEM_EXECUTE		| \

		IMAGE_SCN_ALIGN_16BYTES		# Characteristics

		IMAGE_SCN_MEM_EXECUTE		# Characteristics



	.set	section_count, (. - section_table) / 40

#endif /* CONFIG_EFI_STUB */