commit 6140825b307f986292a0a3698e5cb6ae3cfff6b9
author Mike McTernan <mikemcternan@google.com> Thu Mar 14 17:12:37 2024 +0000
committer Mike McTernan <mikemcternan@google.com> Thu Mar 14 17:18:07 2024 +0000
tree a2107aeebdd280d7a31f4b07c0b5e1848ce40db3
parent 621e9f4e191d643a36c03dab0bf9639a5f8b8e12

trusty:mmu: Make device mapping non-executable

Bug: 328206729
Test: build.py qemu-generic-arm64-test-debug
Change-Id: Iec32339b4ca696b2551bfd532e110e3bf630f853

platform/imx/platform.c

diff --git a/platform/imx/platform.c b/platform/imx/platform.c
index 1e1aa48..664e4a8 100644
--- a/platform/imx/platform.c
+++ b/platform/imx/platform.c
@@ -94,9 +94,10 @@
     status_t ret;
     void* vaddrp = (void*)vaddr;
 
-    ret = vmm_alloc_physical(vmm_get_kernel_aspace(), name, size, &vaddrp, 0,
-                             paddr, VMM_FLAG_VALLOC_SPECIFIC,
-                             ARCH_MMU_FLAG_UNCACHED_DEVICE);
+    ret = vmm_alloc_physical(
+            vmm_get_kernel_aspace(), name, size, &vaddrp, 0, paddr,
+            VMM_FLAG_VALLOC_SPECIFIC,
+            ARCH_MMU_FLAG_UNCACHED_DEVICE | ARCH_MMU_FLAG_PERM_NO_EXECUTE);
     if (ret) {
         dprintf(CRITICAL, "%s: failed %d name=%s\n", __func__, ret, name);
     }