commit 05af2766b70eeae61eaf1729847d3eb2a647a8eb
author Isaac J. Manjarres <isaacmanjarres@google.com> Wed Jan 15 14:28:41 2025 -0800
committer Isaac J. Manjarres <isaacmanjarres@google.com> Wed Jan 15 15:25:36 2025 -0800
tree 8a8379a0012f98b5d02bea9ea323c0f8b044a2f4
parent 95c357244c36d62c3bc67db3ff70ce43e07e9765

ashmem_test: Always include PROT_EXEC as an expected permission

Memfds can always be mapped with PROT_EXEC. There is no support for
removing that, and there is no known reason to support it. Therefore,
update the tests to always expect PROT_EXEC as part of the mapping
permissions.

Bug: 111903542
Change-Id: Ia8bd5d47e012e24045d7ea02f63fe1b15e41e933
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>

libcutils/ashmem_test.cpp

diff --git a/libcutils/ashmem_test.cpp b/libcutils/ashmem_test.cpp
index 9876914..7abc370 100644
--- a/libcutils/ashmem_test.cpp
+++ b/libcutils/ashmem_test.cpp
@@ -181,20 +181,22 @@
     const size_t size = getpagesize();
     void *region;
 
-    ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ));
+    ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ | PROT_EXEC));
     TestProtDenied(fd, size, PROT_WRITE);
-    TestProtIs(fd, PROT_READ);
+    TestProtIs(fd, PROT_READ | PROT_EXEC);
     ASSERT_NO_FATAL_FAILURE(TestMmap(fd, size, PROT_READ, &region));
     EXPECT_EQ(0, munmap(region, size));
 
-    ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ | PROT_WRITE));
-    TestProtIs(fd, PROT_READ | PROT_WRITE);
-    ASSERT_EQ(0, ashmem_set_prot_region(fd, PROT_READ));
+    ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ | PROT_WRITE |
+                                             PROT_EXEC));
+    TestProtIs(fd, PROT_READ | PROT_WRITE | PROT_EXEC);
+    ASSERT_EQ(0, ashmem_set_prot_region(fd, PROT_READ | PROT_EXEC));
     errno = 0;
-    ASSERT_EQ(-1, ashmem_set_prot_region(fd, PROT_READ | PROT_WRITE))
+    ASSERT_EQ(-1, ashmem_set_prot_region(fd, PROT_READ | PROT_WRITE |
+                                         PROT_EXEC))
         << "kernel shouldn't allow adding protection bits";
     EXPECT_EQ(EINVAL, errno);
-    TestProtIs(fd, PROT_READ);
+    TestProtIs(fd, PROT_READ | PROT_EXEC);
     TestProtDenied(fd, size, PROT_WRITE);
 }