summaryrefslogtreecommitdiff
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-05-21 14:10:06 -0700
committerColin Cross <ccross@android.com>2011-06-14 09:09:13 -0700
commit1d38bc7d0523af2233b4280e2aeab34c6a076665 (patch)
tree16c8c61cd13cc2e0d4fd879cc0cd87c893e867d6 /kernel/cgroup.c
parent22e9cd9dc9b51f5ad96588ecbfde5f3221e0e6dd (diff)
cgroup: Add generic cgroup subsystem permission checks.
Rather than using explicit euid == 0 checks when trying to move tasks into a cgroup via CFS, move permission checks into each specific cgroup subsystem. If a subsystem does not specify a 'can_attach' handler, then we fall back to doing our checks the old way. This way non-root processes can add arbitrary processes to a cgroup if all the registered subsystems on that cgroup agree. Also change explicit euid == 0 check to CAP_SYS_ADMIN Signed-off-by: San Mehat <san@google.com>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 2731d115d72..129b47f1df5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -58,6 +58,7 @@
#include <linux/eventfd.h>
#include <linux/poll.h>
#include <linux/flex_array.h> /* used in cgroup_attach_proc */
+#include <linux/capability.h>
#include <asm/atomic.h>
@@ -1839,6 +1840,15 @@ 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;
+
+ /* No can_attach() - check perms generically */
+ tcred = __task_cred(tsk);
+ if (cred->euid != tcred->uid &&
+ cred->euid != tcred->suid) {
+ return -EACCES;
+ }
}
if (ss->can_attach_task) {
retval = ss->can_attach_task(cgrp, tsk);