summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-08-01 17:41:56 -0500
committerGerrit Code Review2018-08-01 17:41:56 -0500
commit8f2a34a89b7ff1263217049fe837237b3af16814 (patch)
treeace6cd8fcc310871b49dbb2d862ec79224ef206f
parent6e05552e357b97403ffa73d8feaf6431689d28a1 (diff)
parentf29b39d9000fe5ec8a2462998e417f84e0d5d3bb (diff)
downloadplatform-system-core-8f2a34a89b7ff1263217049fe837237b3af16814.tar.gz
platform-system-core-8f2a34a89b7ff1263217049fe837237b3af16814.tar.xz
platform-system-core-8f2a34a89b7ff1263217049fe837237b3af16814.zip
Merge "fs_mgr: Always mount tmpfs with MS_NOEXEC"
-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 f9cebeb4d..5f5718264 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1180,8 +1180,8 @@ int fs_mgr_do_tmpfs_mount(const char *n_name)
1180{ 1180{
1181 int ret; 1181 int ret;
1182 1182
1183 ret = mount("tmpfs", n_name, "tmpfs", 1183 ret = mount("tmpfs", n_name, "tmpfs", MS_NOATIME | MS_NOSUID | MS_NODEV | MS_NOEXEC,
1184 MS_NOATIME | MS_NOSUID | MS_NODEV, CRYPTO_TMPFS_OPTIONS); 1184 CRYPTO_TMPFS_OPTIONS);
1185 if (ret < 0) { 1185 if (ret < 0) {
1186 LERROR << "Cannot mount tmpfs filesystem at " << n_name; 1186 LERROR << "Cannot mount tmpfs filesystem at " << n_name;
1187 return -1; 1187 return -1;