dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Eric W. Biederman 2012-03-12 15:44:39 -07:00
parent 8751e03958
commit 14a590c3f9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init/Kconfig
View File

@ -865,7 +865,6 @@ config UIDGID_CONVERTED
# List of kernel pieces that need user namespace work
# Features
depends on CGROUPS = n
depends on MIGRATION = n
depends on NUMA = n
depends on SYSVIPC = n

6
kernel/cgroup.c
View File

@ -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;