ArmVirtPkg: make EFI_LOADER_DATA non-executable

ardbiesheuvel · mergify[bot] · commit 2997ae387397 · 2022-10-26T17:28:39.000Z
When the memory protections were implemented and enabled on ArmVirtQemu
5+ years ago, we had to work around the fact that GRUB at the time
expected EFI_LOADER_DATA to be executable, as that is the memory type it
allocates when loading its modules.

This has been fixed in GRUB in August 2017, so by now, we should be able
to tighten this, and remove execute permissions from EFI_LOADER_DATA
allocations.

Signed-off-by: Ard Biesheuvel &lt;ardb@kernel.org&gt;
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -368,7 +368,7 @@
   # reserved ones, with the exception of LoaderData regions, of which OS loaders
   # (i.e., GRUB) may assume that its contents are executable.
   #
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD1
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD5
 
 [Components.common]
   #

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@`
`368`	`368`	`# reserved ones, with the exception of LoaderData regions, of which OS loaders`
`369`	`369`	`# (i.e., GRUB) may assume that its contents are executable.`
`370`	`370`	`#`
`371`		`- gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy\|0xC000000000007FD1`
	`371`	`+ gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy\|0xC000000000007FD5`
`372`	`372`
`373`	`373`	`[Components.common]`
`374`	`374`	`#`