From: Evgeniy Baskov <baskov@ispras.ru>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Evgeniy Baskov <baskov@ispras.ru>,
Mike Beaton <mjsbeaton@gmail.com>,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
linux-efi@vger.kernel.org
Subject: [PATCH 1/2] x86/boot: Order sections by their RVAs
Date: Mon, 5 Feb 2024 17:44:00 +0300 [thread overview]
Message-ID: <82e66a8c9ae70e416eb8ae5229cf5a93f17921b9.1707141974.git.baskov@ispras.ru> (raw)
In-Reply-To: <cover.1707141974.git.baskov@ispras.ru>
Image loaders which check the contiguity of executable images consider
sections adjacent in the section table to be adjacent in virtual memory.
Sort sections by their RVAs in PE section table.
Signed-off-by: Evgeniy Baskov <baskov@ispras.ru>
---
| 56 +++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 28 deletions(-)
--git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index b2771710ed98..097b84ab288c 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -153,6 +153,34 @@ section_table:
IMAGE_SCN_MEM_READ | \
IMAGE_SCN_MEM_DISCARDABLE # Characteristics
+ .ascii ".text"
+ .byte 0
+ .byte 0
+ .byte 0
+ .long ZO__data
+ .long setup_size
+ .long ZO__data # Size of initialized data
+ # on disk
+ .long setup_size
+ .long 0 # PointerToRelocations
+ .long 0 # PointerToLineNumbers
+ .word 0 # NumberOfRelocations
+ .word 0 # NumberOfLineNumbers
+ .long IMAGE_SCN_CNT_CODE | \
+ IMAGE_SCN_MEM_READ | \
+ IMAGE_SCN_MEM_EXECUTE # Characteristics
+
+ .ascii ".data\0\0\0"
+ .long ZO__end - ZO__data # VirtualSize
+ .long setup_size + ZO__data # VirtualAddress
+ .long ZO__edata - ZO__data # SizeOfRawData
+ .long setup_size + ZO__data # PointerToRawData
+
+ .long 0, 0, 0
+ .long IMAGE_SCN_CNT_INITIALIZED_DATA | \
+ IMAGE_SCN_MEM_READ | \
+ IMAGE_SCN_MEM_WRITE # Characteristics
+
#ifdef CONFIG_EFI_MIXED
.asciz ".compat"
@@ -185,34 +213,6 @@ pecompat_fstart:
.set pecompat_vsize, 0
.set pecompat_fstart, setup_size
#endif
- .ascii ".text"
- .byte 0
- .byte 0
- .byte 0
- .long ZO__data
- .long setup_size
- .long ZO__data # Size of initialized data
- # on disk
- .long setup_size
- .long 0 # PointerToRelocations
- .long 0 # PointerToLineNumbers
- .word 0 # NumberOfRelocations
- .word 0 # NumberOfLineNumbers
- .long IMAGE_SCN_CNT_CODE | \
- IMAGE_SCN_MEM_READ | \
- IMAGE_SCN_MEM_EXECUTE # Characteristics
-
- .ascii ".data\0\0\0"
- .long ZO__end - ZO__data # VirtualSize
- .long setup_size + ZO__data # VirtualAddress
- .long ZO__edata - ZO__data # SizeOfRawData
- .long setup_size + ZO__data # PointerToRawData
-
- .long 0, 0, 0
- .long IMAGE_SCN_CNT_INITIALIZED_DATA | \
- IMAGE_SCN_MEM_READ | \
- IMAGE_SCN_MEM_WRITE # Characteristics
-
.set section_count, (. - section_table) / 40
#endif /* CONFIG_EFI_STUB */
--
2.43.0
next prev parent reply other threads:[~2024-02-05 14:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 14:43 [PATCH 0/2] x86/boot: EFISTUB section alignment Evgeniy Baskov
2024-02-05 14:44 ` Evgeniy Baskov [this message]
2024-02-05 14:49 ` [PATCH 1/2] x86/boot: Order sections by their RVAs Ard Biesheuvel
2024-02-05 15:13 ` Evgeniy Baskov
2024-02-05 15:23 ` Ard Biesheuvel
2024-02-06 12:15 ` Mike Beaton
2024-02-06 12:26 ` Ard Biesheuvel
2024-02-05 14:44 ` [PATCH 2/2] x86/boot: Align .compat virtual size Evgeniy Baskov
2024-02-05 14:50 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=82e66a8c9ae70e416eb8ae5229cf5a93f17921b9.1707141974.git.baskov@ispras.ru \
--to=baskov@ispras.ru \
--cc=ardb@kernel.org \
--cc=khoroshilov@ispras.ru \
--cc=linux-efi@vger.kernel.org \
--cc=mjsbeaton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).