diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-07-26 01:13:20 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 04:17:42 -0800 |
| commit | 142e1d1d5f088e7a38659daca6e84a730967774a (patch) | |
| tree | e2297a9a77f55bb15a566979c9c5658cff4737f8 /kernel/nsproxy.c | |
| parent | b33c77ef23dd3ec5692c9c0cc739a3f5f0f2baae (diff) | |
| download | linux-142e1d1d5f088e7a38659daca6e84a730967774a.tar.gz linux-142e1d1d5f088e7a38659daca6e84a730967774a.tar.bz2 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.c | 3 |
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); |