diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-03 18:38:08 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-04 04:23:45 +0200 |
| commit | 81abe27b10af98f861c955be63da700938dd59c1 (patch) | |
| tree | 924a629ec61becbdfdc6bc4fd86ea21759c6a030 /fs | |
| parent | userns: Allow the usernamespace support to build after the removal of usbfs (diff) | |
| download | linux-81abe27b10af98f861c955be63da700938dd59c1.tar.xz linux-81abe27b10af98f861c955be63da700938dd59c1.zip | |
userns: Fix link restrictions to use uid_eq
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1b464390dde8..05480a64d7b7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -678,7 +678,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd) /* Allowed if owner and follower match. */ inode = link->dentry->d_inode; - if (current_cred()->fsuid == inode->i_uid) + if (uid_eq(current_cred()->fsuid, inode->i_uid)) return 0; /* Allowed if parent directory not sticky and world-writable. */ @@ -687,7 +687,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd) return 0; /* Allowed if parent directory and link owner match. */ - if (parent->i_uid == inode->i_uid) + if (uid_eq(parent->i_uid, inode->i_uid)) return 0; path_put_conditional(link, nd); @@ -757,7 +757,7 @@ static int may_linkat(struct path *link) /* Source inode owner (or CAP_FOWNER) can hardlink all they like, * otherwise, it must be a safe source. */ - if (cred->fsuid == inode->i_uid || safe_hardlink_source(inode) || + if (uid_eq(cred->fsuid, inode->i_uid) || safe_hardlink_source(inode) || capable(CAP_FOWNER)) return 0; |