aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-03-12 15:44:39 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-05-15 14:59:30 -0700
commit14a590c3f987977d7b09ec926481ee0238c08eee (patch)
treeb06a1f674d090abde07bbaca03f53fbe3f346609 /kernel/cgroup.c
parentuserns: Convert tmpfs to use kuid and kgid where appropriate (diff)
downloadlinux-dev-14a590c3f987977d7b09ec926481ee0238c08eee.tar.xz
linux-dev-14a590c3f987977d7b09ec926481ee0238c08eee.zip
userns: Convert cgroup permission checks to use uid_eq
Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ed64ccac67c9..c8329b0c2576 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2160,9 +2160,9 @@ retry_find_task:
* only need to check permissions on one of them.
*/
tcred = __task_cred(tsk);
- if (cred->euid &&
- cred->euid != tcred->uid &&
- cred->euid != tcred->suid) {
+ if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) &&
+ !uid_eq(cred->euid, tcred->uid) &&
+ !uid_eq(cred->euid, tcred->suid)) {
rcu_read_unlock();
ret = -EACCES;
goto out_unlock_cgroup;