diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-03-04 06:17:15 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-03 12:29:34 +0200 |
| commit | 8e96e3b7b8407be794ab1fd8e4b332818a358e78 (patch) | |
| tree | f27756bb2ec49e586221ac669ea00c68e8a2ee58 /fs/fcntl.c | |
| parent | userns: Convert in_group_p and in_egroup_p to use kgid_t (diff) | |
| download | linux-8e96e3b7b8407be794ab1fd8e4b332818a358e78.tar.xz linux-8e96e3b7b8407be794ab1fd8e4b332818a358e78.zip | |
userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 75e7c1f3a080..d078b75572a7 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -532,9 +532,9 @@ static inline int sigio_perm(struct task_struct *p, rcu_read_lock(); cred = __task_cred(p); - ret = ((fown->euid == 0 || - fown->euid == cred->suid || fown->euid == cred->uid || - fown->uid == cred->suid || fown->uid == cred->uid) && + ret = ((uid_eq(fown->euid, GLOBAL_ROOT_UID) || + uid_eq(fown->euid, cred->suid) || uid_eq(fown->euid, cred->uid) || + uid_eq(fown->uid, cred->suid) || uid_eq(fown->uid, cred->uid)) && !security_file_send_sigiotask(p, fown, sig)); rcu_read_unlock(); return ret; |