diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-08 01:34:10 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 12:13:22 +0200 |
| commit | 609fcd1b3a55f99667c61609895c83019b21baad (patch) | |
| tree | f90cec33d1f1e0922c28d5528cd0f535dc235b92 /security/tomoyo/common.c | |
| parent | userns: Convert apparmor to use kuid and kgid where appropriate (diff) | |
| download | linux-609fcd1b3a55f99667c61609895c83019b21baad.tar.xz linux-609fcd1b3a55f99667c61609895c83019b21baad.zip | |
userns: Convert tomoyo to use kuid and kgid where appropriate
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'security/tomoyo/common.c')
| -rw-r--r-- | security/tomoyo/common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index 2e0f12c62938..f89a0333b813 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -925,7 +925,9 @@ static bool tomoyo_manager(void) if (!tomoyo_policy_loaded) return true; - if (!tomoyo_manage_by_non_root && (task->cred->uid || task->cred->euid)) + if (!tomoyo_manage_by_non_root && + (!uid_eq(task->cred->uid, GLOBAL_ROOT_UID) || + !uid_eq(task->cred->euid, GLOBAL_ROOT_UID))) return false; exe = tomoyo_get_exe(); if (!exe) |