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 /net/core/net_namespace.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 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 6456439cbbd9..ec2870b44c1f 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -630,8 +630,13 @@ static void netns_put(void *ns) static int netns_install(struct nsproxy *nsproxy, void *ns) { + struct net *net = ns; + + if (!ns_capable(net->user_ns, CAP_SYS_ADMIN)) + return -EPERM; + put_net(nsproxy->net_ns); - nsproxy->net_ns = get_net(ns); + nsproxy->net_ns = get_net(net); return 0; } |