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 00/13] Hardware enforced W^X memory protections
Date: Mon, 13 Feb 2023 16:17:57 +0100 [thread overview]
Message-ID: <20230213151810.2301480-1-ardb@kernel.org> (raw)
The ARM architecture has an interesting feature in its virtual memory
controls called 'WXN', which puts the MMU in a mode where all mappings
of memory that are writable are implicitly non-executable as well.
While EDK2 implements a couple of memory protection features already, in
some places it still relies fundamentally on mappings that are both
writable and executable at the same time, which is not great from a
robustness and code safety point of view.
This series is a proof-of-concept for ArmVirtQemu that addresses each of
those issues, allowing it to boot into the OS (Linux) successfully with
the WXN control enabled.
The following issues are being addressed:
- the flash region must be mapped read-only explicitly, so that its code
is executable
- the DXE IPL must not run shadowed so it executes in place from the
executable mapping of the FV (and PEIM shadowing must be off in
general)
- the DXE IPL must map the DXE core code region read-only explicitly so
it can execute
- the DXE core must be equipped with a preliminary version of the
SetMemoryAttributes member of the CPU arch protocol so that it can
manipulate memory permissions before the CPU arch protocol driver is
dispatched
- need to use XP mappings for all DRAM regions out of reset - this is
to avoid unbounded recursion in the page table handling code, which
may now be called before the CPU arch protocol driver remaps all
unused regions with XP attributes
- limit the memory regions that are remapped writable+executable during
ExitBootServices() to those pages that are actually subject to
relocation fixups
- ensure that AArch64 runtime DXE driver images do not carry code and
relocatable quantities in the same 4k page, so that clearing the RO
bit does not remove its executable permissions
(patch #1 is preparatory cleanup and not relevant to the above)
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Rebecca Cran <quic_rcran@quicinc.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Taylor Beebe <t@taylorbeebe.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Peter Jones <pjones@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Ard Biesheuvel (13):
ArmPkg/Mmu: Remove handling of NONSECURE memory regions
ArmPkg/ArmMmuLib: Introduce region types for RO/XP WB cached memory
MdePkg/BasePeCoffLib: Add API to keep track of relocation range
MdeModulePkg/DxeIpl: Avoid shadowing IPL PEIM by default
MdeModulePkg/DxeIpl AARCH64: Remap DXE core code section before launch
MdeModulePkg/DxeCore: Reduce range of W+X remaps at EBS time
MdeModulePkg/DxeCore: Permit preliminary CPU arch fallback
ArmPkg: Implement ArmSetMemoryOverrideLib
ArmVirtPkg/ArmVirtQemu: Use XP memory mappings by default
ArmVirtPkg/ArmVirtQemu: Use PEI flavor of ArmMmuLib for all PEIMs
ArmVirtPkg/ArmVirtQemu: Use read-only memory region type for code
flash
BaseTools/GccBase AARCH64: Avoid page sharing between code and data
ArmVirtPkg/ArmVirtQemu: Enable hardware enforced W^X memory
permissions
ArmPkg/Include/Chipset/ArmV7Mmu.h | 51 +++++-------
ArmPkg/Include/Library/ArmLib.h | 17 ++--
ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 34 +++++---
ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 49 ++++++------
ArmPkg/Library/ArmSetMemoryOverrideLib/ArmSetMemoryOverrideLib.c | 56 +++++++++++++
ArmPkg/Library/ArmSetMemoryOverrideLib/ArmSetMemoryOverrideLib.inf | 25 ++++++
ArmVirtPkg/ArmVirt.dsc.inc | 1 +
ArmVirtPkg/ArmVirtQemu.dsc | 11 ++-
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S | 2 +-
ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c | 4 +-
BaseTools/Scripts/GccBase.lds | 13 ++-
MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c | 33 ++++++--
MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c | 69 ++++++++++++++++
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 6 +-
MdeModulePkg/Core/DxeIplPeim/DxeLoad.c | 24 +++---
MdePkg/Include/Library/PeCoffLib.h | 25 ++++++
MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 83 +++++++++++++++++++-
18 files changed, 392 insertions(+), 112 deletions(-)
create mode 100644 ArmPkg/Library/ArmSetMemoryOverrideLib/ArmSetMemoryOverrideLib.c
create mode 100644 ArmPkg/Library/ArmSetMemoryOverrideLib/ArmSetMemoryOverrideLib.inf
--
2.39.1
next 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 Ard Biesheuvel [this message]
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 ` [RFC 03/13] MdePkg/BasePeCoffLib: Add API to keep track of relocation range Ard Biesheuvel
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-1-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