summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Hector Chavez2017-07-10 17:25:55 -0500
committerLuis Hector Chavez2017-07-10 17:28:33 -0500
commitf29b39d9000fe5ec8a2462998e417f84e0d5d3bb (patch)
tree4ba361cee25f37656e0430e6f418f419520edfff
parent896297b2ef10a58fc614aebce8724d342d81f85e (diff)
downloadplatform-system-core-f29b39d9000fe5ec8a2462998e417f84e0d5d3bb.tar.gz
platform-system-core-f29b39d9000fe5ec8a2462998e417f84e0d5d3bb.tar.xz
platform-system-core-f29b39d9000fe5ec8a2462998e417f84e0d5d3bb.zip
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
-rw-r--r--fs_mgr/fs_mgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index cc810746f..292541d8f 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1107,8 +1107,8 @@ int fs_mgr_do_tmpfs_mount(const char *n_name)
1107{ 1107{
1108 int ret; 1108 int ret;
1109 1109
1110 ret = mount("tmpfs", n_name, "tmpfs", 1110 ret = mount("tmpfs", n_name, "tmpfs", MS_NOATIME | MS_NOSUID | MS_NODEV | MS_NOEXEC,
1111 MS_NOATIME | MS_NOSUID | MS_NODEV, CRYPTO_TMPFS_OPTIONS); 1111 CRYPTO_TMPFS_OPTIONS);
1112 if (ret < 0) { 1112 if (ret < 0) {
1113 LERROR << "Cannot mount tmpfs filesystem at " << n_name; 1113 LERROR << "Cannot mount tmpfs filesystem at " << n_name;
1114 return -1; 1114 return -1;