ArmVirtPkg/HighMemDxe: preserve non-exec permissions on newly added regions

Using DxeServices::SetMemorySpaceAttributes to set cacheability
attributes has the side effect of stripping permission attributes,
given that those are bits in the same bitfield, and so setting the
Attributes argument to EFI_MEMORY_WB implies not setting EFI_MEMORY_XP
or EFI_MEMORY_RO attributes.

In fact, the situation is even worse, given that the descriptor returned
by DxeServices::GetMemorySpaceDescriptor does not reflect the permission
attributes that may have been set by the preceding call to
DxeServices::AddMemorySpace if PcdDxeNxMemoryProtectionPolicy has been
configured to map EfiConventionalMemory with non-executable permissions.

Note that this applies equally to the non-executable stack and to PE/COFF
sections that may have been mapped with R-X or RW- permissions. This is
due to the ambiguity in the meaning of the EFI_MEMORY_RO/EFI_MEMORY_XP
attributes when used in the GCD memory map, i.e., between signifying
that an underlying RAM region has the controls to be configured as
read-only or non-executable, and signifying that the contents of a
certain UEFI memory region allow them to be mapped with certain
restricted permissions.

So let's check the policy in PcdDxeNxMemoryProtectionPolicy directly,
and set the EFI_MEMORY_XP attribute if appropriate for
EfiConventionalMemory regions.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
index 22f738279b202e3256e08e8cbd7094fc71767f86..f70978f6414fc80c0325feb7afa42339ae4699f6 100644 (file)
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.c
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
@@ -37,6 +37,7 @@ InitializeHighMemDxe (
   UINTN                 AddressCells, SizeCells;\r
   UINT64                CurBase;\r
   UINT64                CurSize;\r
+  UINT64                Attributes;\r
 \r
   Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
                   (VOID **)&FdtClient);\r
@@ -77,8 +78,21 @@ InitializeHighMemDxe (
           continue;\r
         }\r
 \r
-        Status = gDS->SetMemorySpaceAttributes (CurBase, CurSize,\r
-                        EFI_MEMORY_WB);\r
+        //\r
+        // Take care not to strip any permission attributes that will have been\r
+        // set by DxeCore on the region we just added if a strict permission\r
+        // policy is in effect for EfiConventionalMemory regions.\r
+        // Unfortunately, we cannot interrogate the GCD memory space map for\r
+        // those permissions, since they are not recorded there (for historical\r
+        // reasons), so check the policy directly.\r
+        //\r
+        Attributes = EFI_MEMORY_WB;\r
+        if ((PcdGet64 (PcdDxeNxMemoryProtectionPolicy) &\r
+             (1U << (UINT32)EfiConventionalMemory)) != 0) {\r
+          Attributes |= EFI_MEMORY_XP;\r
+        }\r
+\r
+        Status = gDS->SetMemorySpaceAttributes (CurBase, CurSize, Attributes);\r
 \r
         if (EFI_ERROR (Status)) {\r
           DEBUG ((EFI_D_ERROR,\r

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
index 3661cfd8c80c4ddffe641200248322579a27aa81..89c743ebe058d9a0c268191c6b75362d6d047556 100644 (file)
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
@@ -45,6 +45,7 @@
 \r
 [Pcd]\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy\r
 \r
 [Depex]\r
   gEfiCpuArchProtocolGuid AND gFdtClientProtocolGuid\r