summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-07-26 10:13:20 +0200
committerEric W. Biederman <ebiederm@xmission.com>2012-11-20 13:17:42 +0100
commit142e1d1d5f088e7a38659daca6e84a730967774a (patch)
treee2297a9a77f55bb15a566979c9c5658cff4737f8 /kernel/nsproxy.c
parentuserns: Allow unprivileged users to create new namespaces (diff)
downloadlinux-142e1d1d5f088e7a38659daca6e84a730967774a.tar.xz
linux-142e1d1d5f088e7a38659daca6e84a730967774a.zip
userns: Allow unprivileged use of setns.
- Push the permission check from the core setns syscall into the setns install methods where the user namespace of the target namespace can be determined, and used in a ns_capable call. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index a214e0e9035f..4357a0a7d17d 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -242,9 +242,6 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
struct file *file;
int err;
- if (!capable(CAP_SYS_ADMIN))
- return -EPERM;
-
file = proc_ns_fget(fd);
if (IS_ERR(file))
return PTR_ERR(file);