summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-03-22 11:28:03 -0700
committerBrian Swetland <swetland@google.com>2011-03-29 13:57:48 -0700
commit5e9c3c8826c4273f4547b84d7da76bb8a95e6c97 (patch)
tree207f1afd50acccf4138c1ba2b68e34b8c203e8cd /kernel
parente7f98ffb81389f506451646e38c1fee8398cf03c (diff)
Fix cgroup: Add generic cgroup subsystem permission checks.
Change-Id: Ib82f6a716686a3ebb4592112400fc5e4a2ce066c Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 12f73d2f8398..243dc63ca848 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1783,6 +1783,7 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
*/
failed_ss = ss;
goto out;
+ }
} else if (!capable(CAP_SYS_ADMIN)) {
const struct cred *cred = current_cred(), *tcred;