commit f2d1d830488447f2bd803b2da2198da3918a75b4
author Luis Hector Chavez <lhchavez@google.com> Wed Aug 01 16:16:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 16:16:27 2018 -0700
tree 12ffc12b88a740896c2f2ab0ae3df27af6b3953e
parent fff902376224242dccd2c6c65f66170cdcdbbd96
parent 22ba17b6adcba90d133ed4b3d13be1320b3aa3d8

Merge "fs_mgr: Always mount tmpfs with MS_NOEXEC"
am: 8f2a34a89b

Change-Id: I80ac903329f24756ef8a3d9bade11f446b2e1c31

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index f9cebeb..5f57182 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1180,8 +1180,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;