summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-07-27 05:56:48 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-11-20 04:19:18 -0800
commit4f326c0064b20b78b8041f4d2f6fe188a1129f18 (patch)
tree867ddce014cb780460130ecf5924069d588fa9c9
parentc450f371d48557e3e0fa510a4af27b92f0d8c4cc (diff)
downloadlinux-3.10-4f326c0064b20b78b8041f4d2f6fe188a1129f18.tar.gz
linux-3.10-4f326c0064b20b78b8041f4d2f6fe188a1129f18.tar.bz2
linux-3.10-4f326c0064b20b78b8041f4d2f6fe188a1129f18.zip
userns: Allow unprivilged mounts of proc and sysfs
- The context in which proc and sysfs are mounted have no effect on the the uid/gid of their files so no conversion is needed except allowing the mount. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--fs/proc/root.c1
-rw-r--r--fs/sysfs/mount.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c
index f2f251158d3..c6e9fac26ba 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -145,6 +145,7 @@ static struct file_system_type proc_fs_type = {
.name = "proc",
.mount = proc_mount,
.kill_sb = proc_kill_sb,
+ .fs_flags = FS_USERNS_MOUNT,
};
void __init proc_root_init(void)
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 71eb7e25392..db940a9be04 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -149,6 +149,7 @@ static struct file_system_type sysfs_fs_type = {
.name = "sysfs",
.mount = sysfs_mount,
.kill_sb = sysfs_kill_sb,
+ .fs_flags = FS_USERNS_MOUNT,
};
int __init sysfs_init(void)