diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-03-12 18:44:39 -0400 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 17:59:30 -0400 |
| commit | 14a590c3f987977d7b09ec926481ee0238c08eee (patch) | |
| tree | b06a1f674d090abde07bbaca03f53fbe3f346609 /kernel | |
| parent | 8751e03958f2adbfba6a0f186f4c5797c950c22a (diff) | |
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')
| -rw-r--r-- | kernel/cgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index ed64ccac67c..c8329b0c257 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -2160,9 +2160,9 @@ retry_find_task: | |||
| 2160 | * only need to check permissions on one of them. | 2160 | * only need to check permissions on one of them. |
| 2161 | */ | 2161 | */ |
| 2162 | tcred = __task_cred(tsk); | 2162 | tcred = __task_cred(tsk); |
| 2163 | if (cred->euid && | 2163 | if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && |
| 2164 | cred->euid != tcred->uid && | 2164 | !uid_eq(cred->euid, tcred->uid) && |
| 2165 | cred->euid != tcred->suid) { | 2165 | !uid_eq(cred->euid, tcred->suid)) { |
| 2166 | rcu_read_unlock(); | 2166 | rcu_read_unlock(); |
| 2167 | ret = -EACCES; | 2167 | ret = -EACCES; |
| 2168 | goto out_unlock_cgroup; | 2168 | goto out_unlock_cgroup; |