From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Dec 2010 21:33:24 +0000 (+0100)
Subject: mount-setup: drop noexec flag from default mount options for /dev/shm
X-Git-Tag: v16~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=501c875bffaef3263ad42c32485c7fde41027175

mount-setup: drop noexec flag from default mount options for /dev/shm

We shouldn't break PROT_EXEC which is a valid mmap() flag.
---

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 4adb86f15..b85ac6d3f 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -48,7 +48,7 @@ static const MountPoint mount_table[] = {
         { "proc",     "/proc",                  "proc",     NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "sysfs",    "/sys",                   "sysfs",    NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID,                    true },
-        { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
+        { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV,           true },
         { "devpts",   "/dev/pts",               "devpts",   NULL,                MS_NOSUID|MS_NOEXEC,          false },
         { "tmpfs",    "/sys/fs/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/sys/fs/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },