cgroup: cgroup namespace setns support
authorAditya Kali <adityakali@google.com>
Fri, 29 Jan 2016 08:54:07 +0000 (02:54 -0600)
committerTejun Heo <tj@kernel.org>
Tue, 16 Feb 2016 18:04:58 +0000 (13:04 -0500)
setns on a cgroup namespace is allowed only if
task has CAP_SYS_ADMIN in its current user-namespace and
over the user-namespace associated with target cgroupns.
No implicit cgroup changes happen with attaching to another
cgroupns. It is expected that the somone moves the attaching
process under the target cgroupns-root.

Signed-off-by: Aditya Kali <adityakali@google.com>
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/cgroup.c

index b001c5d36becf0f35cf0343eccdb82dcad16f1ab..b086a461be23a05d443085c3125366a19c0646ae 100644 (file)
@@ -6057,10 +6057,23 @@ static inline struct cgroup_namespace *to_cg_ns(struct ns_common *ns)
        return container_of(ns, struct cgroup_namespace, ns);
 }
 
-static int cgroupns_install(struct nsproxy *nsproxy, void *ns)
+static int cgroupns_install(struct nsproxy *nsproxy, struct ns_common *ns)
 {
-       pr_info("setns not supported for cgroup namespace");
-       return -EINVAL;
+       struct cgroup_namespace *cgroup_ns = to_cg_ns(ns);
+
+       if (!ns_capable(current_user_ns(), CAP_SYS_ADMIN) ||
+           !ns_capable(cgroup_ns->user_ns, CAP_SYS_ADMIN))
+               return -EPERM;
+
+       /* Don't need to do anything if we are attaching to our own cgroupns. */
+       if (cgroup_ns == nsproxy->cgroup_ns)
+               return 0;
+
+       get_cgroup_ns(cgroup_ns);
+       put_cgroup_ns(nsproxy->cgroup_ns);
+       nsproxy->cgroup_ns = cgroup_ns;
+
+       return 0;
 }
 
 static struct ns_common *cgroupns_get(struct task_struct *task)
This page took 0.027729 seconds and 5 git commands to generate.