Skip to content

Commit bfab35f

Browse files
ardbiesheuvelIngo Molnar
authored and
Ingo Molnar
committed
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: Ard Biesheuvel <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7e50262 commit bfab35f

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/x86/boot/header.S

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ section_table:
209209
.word 0 # NumberOfLineNumbers
210210
.long IMAGE_SCN_CNT_CODE | \
211211
IMAGE_SCN_MEM_READ | \
212-
IMAGE_SCN_MEM_EXECUTE | \
213-
IMAGE_SCN_ALIGN_16BYTES # Characteristics
212+
IMAGE_SCN_MEM_EXECUTE # Characteristics
214213

215214
#
216215
# The EFI application loader requires a relocation section
@@ -230,8 +229,7 @@ section_table:
230229
.word 0 # NumberOfLineNumbers
231230
.long IMAGE_SCN_CNT_INITIALIZED_DATA | \
232231
IMAGE_SCN_MEM_READ | \
233-
IMAGE_SCN_MEM_DISCARDABLE | \
234-
IMAGE_SCN_ALIGN_1BYTES # Characteristics
232+
IMAGE_SCN_MEM_DISCARDABLE # Characteristics
235233

236234
#ifdef CONFIG_EFI_MIXED
237235
#
@@ -249,8 +247,7 @@ section_table:
249247
.word 0 # NumberOfLineNumbers
250248
.long IMAGE_SCN_CNT_INITIALIZED_DATA | \
251249
IMAGE_SCN_MEM_READ | \
252-
IMAGE_SCN_MEM_DISCARDABLE | \
253-
IMAGE_SCN_ALIGN_1BYTES # Characteristics
250+
IMAGE_SCN_MEM_DISCARDABLE # Characteristics
254251
#endif
255252

256253
#
@@ -271,8 +268,7 @@ section_table:
271268
.word 0 # NumberOfLineNumbers
272269
.long IMAGE_SCN_CNT_CODE | \
273270
IMAGE_SCN_MEM_READ | \
274-
IMAGE_SCN_MEM_EXECUTE | \
275-
IMAGE_SCN_ALIGN_16BYTES # Characteristics
271+
IMAGE_SCN_MEM_EXECUTE # Characteristics
276272

277273
.set section_count, (. - section_table) / 40
278274
#endif /* CONFIG_EFI_STUB */

0 commit comments

Comments
 (0)