On Mon, Mar 13, 2023 at 18:17:03 +0100, Ard Biesheuvel wrote:
> The AArch64 ARM architecture supports a hardware enforcement mode for
> mutual exclusion between code and data: any page that is mapped writable
> is implicitly non-executable as well.
>
> This means that remapping part of a runtime image for reapplying
> relocation fixups may result in any code sharing the same page to lose
> its executable permissions.
>
> Let's avoid this, by moving all quantities that are subject to
> relocation fixups to a separate page if the build is using 64k section
> alignment, which is only the case when building a runtime driver for
> AArch64.
>
> Signed-off-by: Ard Biesheuvel <a...@kernel.org>
> ---
> BaseTools/Scripts/GccBase.lds | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/BaseTools/Scripts/GccBase.lds b/BaseTools/Scripts/GccBase.lds
> index 83cebd29d599..63e097e0727c 100644
> --- a/BaseTools/Scripts/GccBase.lds
> +++ b/BaseTools/Scripts/GccBase.lds
> @@ -21,9 +21,8 @@ SECTIONS {
> . = PECOFF_HEADER_SIZE;
>
> .text : ALIGN(CONSTANT(COMMONPAGESIZE)) {
> - *(.text .text.* .stub .gnu.linkonce.t.*)
> + *(.text .text.* .stub .gnu.linkonce.t.* .plt)
> *(.rodata .rodata.* .gnu.linkonce.r.*)
> - *(.got .got.*)
>
> /*
> * The contents of AutoGen.c files are mostly constant from the POV of
> the
> @@ -34,6 +33,16 @@ SECTIONS {
> * emitted GUIDs here.
> */
> *:AutoGen.obj(.data.g*Guid)
> +
> + /*
> + * AArch64 runtime drivers use 64k alignment, and may run in a mode where
Hmm ... is this strictly speaking true?
I.e., yes, all 4k pages within a 64k page need to share the same
permissions, but that could arguably be provided by pooling 4k
allocations together for multiple runtime drivers?
Will this alignment constraint conflict with that, or just help
enforce the mapping compatibility?
/
Leif
> + * mutual exclusion of RO and XP mappings are hardware enforced. In such
> + * cases, the input sections below, which carry any quantities that are
> + * subject to relocation fixups at runtime, must not share a 4 KiB page
> + * with any code content.
> + */
> + . = ALIGN(CONSTANT(COMMONPAGESIZE) > 0x1000 ? 0x1000 : 0x20);
> + *(.got .got.* .data.rel.ro)
> }
>
> /*
> --
> 2.39.2
>
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101271): https://edk2.groups.io/g/devel/message/101271
Mute This Topic: https://groups.io/mt/97586036/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
