From: "Ard Biesheuvel" <ardb@kernel.org>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb@kernel.org>,
Michael Kinney <michael.d.kinney@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Jiewen Yao <jiewen.yao@intel.com>,
Michael Kubacki <michael.kubacki@microsoft.com>,
Sean Brogan <sean.brogan@microsoft.com>,
Rebecca Cran <quic_rcran@quicinc.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Taylor Beebe <t@taylorbeebe.com>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Peter Jones <pjones@redhat.com>,
Kees Cook <keescook@chromium.org>
Subject: [RFC 03/13] MdePkg/BasePeCoffLib: Add API to keep track of relocation range
Date: Mon, 13 Feb 2023 16:18:00 +0100 [thread overview]
Message-ID: <20230213151810.2301480-4-ardb@kernel.org> (raw)
In-Reply-To: <20230213151810.2301480-1-ardb@kernel.org>
Add a library call to obtain the start and end of the region covered by
relocation fixups. This will be used in a future patch to limit the
range of memory that needs to be remapped with read-write-execute
permissions at ExitBootServices() time.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
MdePkg/Include/Library/PeCoffLib.h | 25 ++++++
MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 83 +++++++++++++++++++-
2 files changed, 107 insertions(+), 1 deletion(-)
diff --git a/MdePkg/Include/Library/PeCoffLib.h b/MdePkg/Include/Library/PeCoffLib.h
index b45879453785..3706c8a4e858 100644
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/MdePkg/Include/Library/PeCoffLib.h
@@ -382,4 +382,29 @@ PeCoffLoaderUnloadImage (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
);
+/**
+ Retrieve the range subject to relocation fixups from the recorded fixup data
+ of a runtime image
+
+ @param ImageBase The base address of a PE/COFF image that has been loaded
+ and relocated into system memory.
+ @param VirtImageBase The request virtual address that the PE/COFF image is to
+ be fixed up for.
+ @param ImageSize The size, in bytes, of the PE/COFF image.
+ @param RelocationData A pointer to the relocation data that was collected when the
+ PE/COFF image was relocated using PeCoffLoaderRelocateImage().
+ @param[out] RelocationRangeMin The start of the relocated range.
+ @param[out] RelocationRangeMax The end of the relocated range.
+
+**/
+VOID
+EFIAPI
+PeCoffLoaderGetRelocationRange (
+ IN PHYSICAL_ADDRESS ImageBase,
+ IN UINTN ImageSize,
+ IN VOID *RelocationData,
+ OUT PHYSICAL_ADDRESS *RelocationRangeMin,
+ OUT PHYSICAL_ADDRESS *RelocationRangeMax
+ );
+
#endif
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 97a8aaf8c73d..10f3d04d2490 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -936,6 +936,8 @@ PeCoffLoaderRelocateImage (
PHYSICAL_ADDRESS BaseAddress;
UINT32 NumberOfRvaAndSizes;
UINT32 TeStrippedOffset;
+ PHYSICAL_ADDRESS *RelocRangeStart;
+ PHYSICAL_ADDRESS *RelocRangeEnd;
ASSERT (ImageContext != NULL);
@@ -1043,6 +1045,21 @@ PeCoffLoaderRelocateImage (
// Run the relocation information and apply the fixups
//
FixupData = ImageContext->FixupData;
+ if (FixupData != NULL) {
+ FixupData = ALIGN_POINTER (FixupData, sizeof (PHYSICAL_ADDRESS));
+
+ //
+ // Use the first two UINT64s in the fixup data to keep track of the start
+ // and end of the region that is subject to relocation fixups.
+ //
+ RelocRangeStart = (PHYSICAL_ADDRESS *)FixupData;
+ RelocRangeEnd = RelocRangeStart + 1;
+ FixupData += 2 * sizeof (PHYSICAL_ADDRESS);
+
+ *RelocRangeStart = MAX_UINT64;
+ *RelocRangeEnd = 0;
+ }
+
while ((UINTN)RelocBase < (UINTN)RelocBaseEnd) {
Reloc = (UINT16 *)((CHAR8 *)RelocBase + sizeof (EFI_IMAGE_BASE_RELOCATION));
//
@@ -1070,6 +1087,14 @@ PeCoffLoaderRelocateImage (
return RETURN_LOAD_ERROR;
}
+ //
+ // Capture this page in the recorded relocation range
+ //
+ if (FixupData != NULL) {
+ *RelocRangeStart = MIN (*RelocRangeStart, (UINTN)FixupBase);
+ *RelocRangeEnd = MAX (*RelocRangeEnd, (UINTN)FixupBase + SIZE_4KB);
+ }
+
//
// Run this relocation record
//
@@ -1470,6 +1495,9 @@ PeCoffLoaderLoadImage (
//
ImageContext->FixupData = NULL;
+ // Add two UINT64s at the start to carry the min/max of the relocated range
+ ImageContext->FixupDataSize += 2 * sizeof (PHYSICAL_ADDRESS);
+
//
// Load the Codeview information if present
//
@@ -1824,7 +1852,8 @@ PeCoffLoaderRelocateImageForRuntime (
// by code will not be fixed up, since that would set them back to
// defaults.
//
- FixupData = RelocationData;
+ FixupData = ALIGN_POINTER (RelocationData, sizeof (PHYSICAL_ADDRESS));
+ FixupData += 2 * sizeof (PHYSICAL_ADDRESS);
RelocBaseOrig = RelocBase;
while ((UINTN)RelocBase < (UINTN)RelocBaseEnd) {
//
@@ -1994,3 +2023,55 @@ PeCoffLoaderUnloadImage (
PeCoffLoaderUnloadImageExtraAction (ImageContext);
return RETURN_SUCCESS;
}
+
+/**
+ Retrieve the range subject to relocation fixups from the recorded fixup data
+ of a runtime image
+
+ @param ImageBase The base address of a PE/COFF image that has been loaded
+ and relocated into system memory.
+ @param VirtImageBase The request virtual address that the PE/COFF image is to
+ be fixed up for.
+ @param ImageSize The size, in bytes, of the PE/COFF image.
+ @param RelocationData A pointer to the relocation data that was collected when the
+ PE/COFF image was relocated using PeCoffLoaderRelocateImage().
+ @param[out] RelocationRangeMin The start of the relocated range.
+ @param[out] RelocationRangeMax The end of the relocated range.
+
+**/
+VOID
+EFIAPI
+PeCoffLoaderGetRelocationRange (
+ IN PHYSICAL_ADDRESS ImageBase,
+ IN UINTN ImageSize,
+ IN VOID *RelocationData,
+ OUT PHYSICAL_ADDRESS *RelocationRangeMin,
+ OUT PHYSICAL_ADDRESS *RelocationRangeMax
+ )
+{
+ PHYSICAL_ADDRESS *FixupData;
+
+ if ((RelocationData == NULL) || (ImageBase == 0x0)) {
+ return;
+ }
+
+ FixupData = ALIGN_POINTER (RelocationData, sizeof (PHYSICAL_ADDRESS));
+
+ if ((FixupData[0] == MAX_UINT64) && (FixupData[1] == 0)) {
+ // No fixups recorded
+ *RelocationRangeMin = ImageBase;
+ *RelocationRangeMax = ImageBase;
+ return;
+ }
+
+ if ((FixupData[0] < ImageBase) ||
+ (FixupData[1] > (ImageBase + ImageSize))) {
+ ASSERT (FALSE);
+ *RelocationRangeMin = ImageBase;
+ *RelocationRangeMax = ImageBase + ImageSize;
+ return;
+ }
+
+ *RelocationRangeMin = FixupData[0];
+ *RelocationRangeMax = FixupData[1];
+}
--
2.39.1
next prev parent reply other threads:[~2023-02-13 15:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 15:17 [RFC 00/13] Hardware enforced W^X memory protections Ard Biesheuvel
2023-02-13 15:17 ` [RFC 01/13] ArmPkg/Mmu: Remove handling of NONSECURE memory regions Ard Biesheuvel
2023-02-13 15:17 ` [RFC 02/13] ArmPkg/ArmMmuLib: Introduce region types for RO/XP WB cached memory Ard Biesheuvel
2023-02-13 15:18 ` Ard Biesheuvel [this message]
2023-02-13 15:18 ` [RFC 04/13] MdeModulePkg/DxeIpl: Avoid shadowing IPL PEIM by default Ard Biesheuvel
2023-02-13 15:18 ` [RFC 05/13] MdeModulePkg/DxeIpl AARCH64: Remap DXE core code section before launch Ard Biesheuvel
2023-02-13 15:18 ` [RFC 06/13] MdeModulePkg/DxeCore: Reduce range of W+X remaps at EBS time Ard Biesheuvel
2023-02-13 15:18 ` [RFC 07/13] MdeModulePkg/DxeCore: Permit preliminary CPU arch fallback Ard Biesheuvel
2023-02-13 21:32 ` [edk2-devel] " Marvin Häuser
2023-02-13 22:07 ` Ard Biesheuvel
2023-02-13 22:24 ` Marvin Häuser
2023-02-13 15:18 ` [RFC 08/13] ArmPkg: Implement ArmSetMemoryOverrideLib Ard Biesheuvel
2023-02-13 15:18 ` [RFC 09/13] ArmVirtPkg/ArmVirtQemu: Use XP memory mappings by default Ard Biesheuvel
2023-02-13 15:18 ` [RFC 10/13] ArmVirtPkg/ArmVirtQemu: Use PEI flavor of ArmMmuLib for all PEIMs Ard Biesheuvel
2023-02-13 15:18 ` [RFC 11/13] ArmVirtPkg/ArmVirtQemu: Use read-only memory region type for code flash Ard Biesheuvel
2023-02-13 15:18 ` [RFC 12/13] BaseTools/GccBase AARCH64: Avoid page sharing between code and data Ard Biesheuvel
2023-02-13 15:18 ` [RFC 13/13] ArmVirtPkg/ArmVirtQemu: Enable hardware enforced W^X memory permissions Ard Biesheuvel
2023-02-13 21:16 ` [edk2-devel] " Marvin Häuser
2023-02-13 21:59 ` Ard Biesheuvel
2023-02-13 22:23 ` Marvin Häuser
2023-02-13 22:37 ` 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-list 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=20230213151810.2301480-4-ardb@kernel.org \
--to=devel@edk2.groups.io \
/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