commit 8c05a95170655fb183996a471ccea967cb4627ca
author Luis Hector Chavez <lhchavez@google.com> Mon Jul 10 15:25:55 2017 -0700
committer Luis Hector Chavez <lhchavez@google.com> Mon Jul 10 15:28:33 2017 -0700
tree 4ba361cee25f37656e0430e6f418f419520edfff
parent 4e51e25f58f7209283051bd08daca7032ff6a9ca

fs_mgr: Always mount tmpfs with MS_NOEXEC

This change adds MS_NOEXEC to the list of flags used in
fs_mgr_do_tmpfs_mount().

Bug: 62419743
Test: aosp_bullhead-eng still boots
Change-Id: I3ee3bb825a59437eba48e3a5b898dd2e385a9ab7

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index cc81074..292541d 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1107,8 +1107,8 @@
 {
     int ret;
 
-    ret = mount("tmpfs", n_name, "tmpfs",
-                MS_NOATIME | MS_NOSUID | MS_NODEV, CRYPTO_TMPFS_OPTIONS);
+    ret = mount("tmpfs", n_name, "tmpfs", MS_NOATIME | MS_NOSUID | MS_NODEV | MS_NOEXEC,
+                CRYPTO_TMPFS_OPTIONS);
     if (ret < 0) {
         LERROR << "Cannot mount tmpfs filesystem at " << n_name;
         return -1;