diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-03-04 00:17:15 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-03 06:29:34 -0400 |
commit | 8e96e3b7b8407be794ab1fd8e4b332818a358e78 (patch) | |
tree | f27756bb2ec49e586221ac669ea00c68e8a2ee58 /fs/fcntl.c | |
parent | 72cda3d1ef24ab0a9a89c15e9776ca737b75f45a (diff) |
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, | |||
532 | 532 | ||
533 | rcu_read_lock(); | 533 | rcu_read_lock(); |
534 | cred = __task_cred(p); | 534 | cred = __task_cred(p); |
535 | ret = ((fown->euid == 0 || | 535 | ret = ((uid_eq(fown->euid, GLOBAL_ROOT_UID) || |
536 | fown->euid == cred->suid || fown->euid == cred->uid || | 536 | uid_eq(fown->euid, cred->suid) || uid_eq(fown->euid, cred->uid) || |
537 | fown->uid == cred->suid || fown->uid == cred->uid) && | 537 | uid_eq(fown->uid, cred->suid) || uid_eq(fown->uid, cred->uid)) && |
538 | !security_file_send_sigiotask(p, fown, sig)); | 538 | !security_file_send_sigiotask(p, fown, sig)); |
539 | rcu_read_unlock(); | 539 | rcu_read_unlock(); |
540 | return ret; | 540 | return ret; |