diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-07-26 10:13:20 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 13:17:42 +0100 |
| commit | 142e1d1d5f088e7a38659daca6e84a730967774a (patch) | |
| tree | e2297a9a77f55bb15a566979c9c5658cff4737f8 /kernel | |
| parent | userns: Allow unprivileged users to create new namespaces (diff) | |
| download | linux-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')
| -rw-r--r-- | kernel/nsproxy.c | 3 | ||||
| -rw-r--r-- | kernel/utsname.c | 7 |
2 files changed, 6 insertions, 4 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); diff --git a/kernel/utsname.c b/kernel/utsname.c index 679d97a5d3fd..4a9362f9325d 100644 --- a/kernel/utsname.c +++ b/kernel/utsname.c @@ -102,8 +102,13 @@ static void utsns_put(void *ns) put_uts_ns(ns); } -static int utsns_install(struct nsproxy *nsproxy, void *ns) +static int utsns_install(struct nsproxy *nsproxy, void *new) { + struct uts_namespace *ns = new; + + if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN)) + return -EPERM; + get_uts_ns(ns); put_uts_ns(nsproxy->uts_ns); nsproxy->uts_ns = ns; |