X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount-setup.c;h=b6b6a0c94ffe7e1b32e29e6522de8402b9f9141c;hb=47342320a097523d93040cdd627e237a420572c5;hp=33e6f4fa0e570f63de56d2d43324173f255b6dde;hpb=f5644ae461dfed81fc1eb1212a15992be13b80fd;p=elogind.git

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 33e6f4fa0..b6b6a0c94 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -46,11 +46,21 @@ static const MountPoint mount_table[] = {
         { "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 },
-        { "devpts",   "/dev/pts",        "devpts",   NULL,                MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
+        { "devpts",   "/dev/pts",        "devpts",   NULL,                MS_NOSUID|MS_NOEXEC,          false },
         { "tmpfs",    "/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };
 
+/* These are API file systems that might be mounted by other software,
+ * we just list them here so that we know that we should igore them */
+
+static const char * const ignore_paths[] = {
+        "/selinux",
+        "/proc/bus/usb",
+        "/var/lib/nfs/rpc_pipefs",
+        "/proc/fs/nfsd"
+};
+
 bool mount_point_is_api(const char *path) {
         unsigned i;
 
@@ -61,6 +71,10 @@ bool mount_point_is_api(const char *path) {
                 if (path_startswith(path, mount_table[i].where))
                         return true;
 
+        for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
+                if (path_startswith(path, ignore_paths[i]))
+                        return true;
+
         return path_startswith(path, "/cgroup/");
 }