summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-25 12:59:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 12:59:15 +0000
commitd6dc98307833341b1382a9e0eb444e643fabc605 (patch)
treecaa8db5135ebd16404242b46459e7f52949ca05d
parentba5d1bc86b9ee058c8272273648d38bcd0f7b346 (diff)
parent744c4986a1cdbf5c2cbe71d149f1545052e4f33f (diff)
downloadsystem_core-d6dc98307833341b1382a9e0eb444e643fabc605.zip
system_core-d6dc98307833341b1382a9e0eb444e643fabc605.tar.gz
system_core-d6dc98307833341b1382a9e0eb444e643fabc605.tar.bz2
am 744c4986: Merge "sdcard: mount sdcard with the noexec option"
* commit '744c4986a1cdbf5c2cbe71d149f1545052e4f33f': sdcard: mount sdcard with the noexec option
-rw-r--r--sdcard/sdcard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 9ba81ff..2318978 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1834,7 +1834,7 @@ static int run(const char* source_path, const char* dest_path, uid_t uid,
"fd=%i,rootmode=40000,default_permissions,allow_other,user_id=%d,group_id=%d",
fd, uid, gid);
- res = mount("/dev/fuse", dest_path, "fuse", MS_NOSUID | MS_NODEV, opts);
+ res = mount("/dev/fuse", dest_path, "fuse", MS_NOSUID | MS_NODEV | MS_NOEXEC, opts);
if (res < 0) {
ERROR("cannot mount fuse filesystem: %s\n", strerror(errno));
goto error;