diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-03-03 21:17:15 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-03 03:29:34 -0700 |
| commit | 8e96e3b7b8407be794ab1fd8e4b332818a358e78 (patch) | |
| tree | f27756bb2ec49e586221ac669ea00c68e8a2ee58 /fs/attr.c | |
| parent | 72cda3d1ef24ab0a9a89c15e9776ca737b75f45a (diff) | |
| download | linux-next-8e96e3b7b8407be794ab1fd8e4b332818a358e78.tar.gz | |
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/attr.c')
| -rw-r--r-- | fs/attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/attr.c b/fs/attr.c index 73f69a6ce9ed..584620e5dee5 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -47,14 +47,14 @@ int inode_change_ok(const struct inode *inode, struct iattr *attr) /* Make sure a caller can chown. */ if ((ia_valid & ATTR_UID) && - (current_fsuid() != inode->i_uid || - attr->ia_uid != inode->i_uid) && !capable(CAP_CHOWN)) + (!uid_eq(current_fsuid(), inode->i_uid) || + !uid_eq(attr->ia_uid, inode->i_uid)) && !capable(CAP_CHOWN)) return -EPERM; /* Make sure caller can chgrp. */ if ((ia_valid & ATTR_GID) && - (current_fsuid() != inode->i_uid || - (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) && + (!uid_eq(current_fsuid(), inode->i_uid) || + (!in_group_p(attr->ia_gid) && !gid_eq(attr->ia_gid, inode->i_gid))) && !capable(CAP_CHOWN)) return -EPERM; |