We allow a task to change its own devices cgroup, or to change other tasks' cgroups if it has CAP_SYS_ADMIN. Also allow task A to change task B's cgroup if task A has CAP_SYS_ADMIN with respect to task B - meaning A is root in the same userns, or A created B's userns. Signed-off-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> --- security/device_cgroup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 9760ecb6..8f5386ea 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -74,11 +74,14 @@ struct cgroup_subsys devices_subsys; static int devcgroup_can_attach(struct cgroup *new_cgrp, struct cgroup_taskset *set) { - struct task_struct *task = cgroup_taskset_first(set); + struct task_struct *t = cgroup_taskset_first(set); + int ret = 0; - if (current != task && !capable(CAP_SYS_ADMIN)) - return -EPERM; - return 0; + rcu_read_lock(); + if (current != t && !ns_capable(__task_cred(t)->user_ns, CAP_SYS_ADMIN)) + ret = -EPERM; + rcu_read_unlock(); + return ret; } /* -- 1.7.9.5 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers