commit 3f3317e75ec8d8f9019b90dd19e3c77002eb7d35
author Elliott Hughes <enh@google.com> Tue Nov 25 13:04:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 13:04:25 2014 +0000
tree ef3f3d41dbeaa297d4eb285acc7d2e9c49bd8c69
parent f3fc2696f01aaa641eacf92cc11c3e83471f64d6
parent d6dc98307833341b1382a9e0eb444e643fabc605

am d6dc9830: am 744c4986: Merge "sdcard: mount sdcard with the noexec option"

* commit 'd6dc98307833341b1382a9e0eb444e643fabc605':
  sdcard: mount sdcard with the noexec option

sdcard/sdcard.c

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 @@
             "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;