leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userns: Fix link restrictions to use uid_eq

Browse Source 
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-08-03 09:38:08 -07:00
parent d755586052
commit 81abe27b10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/namei.c
View File

@ -678,7 +678,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
/* Allowed if owner and follower match. */ /* Allowed if owner and follower match. */
inode = link->dentry->d_inode; inode = link->dentry->d_inode;
if (current_cred()->fsuid == inode->i_uid) if (uid_eq(current_cred()->fsuid, inode->i_uid))
return 0; return 0;
/* Allowed if parent directory not sticky and world-writable. */ /* 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; return 0;
/* Allowed if parent directory and link owner match. */ /* 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; return 0;
path_put_conditional(link, nd); 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, /* Source inode owner (or CAP_FOWNER) can hardlink all they like,
* otherwise, it must be a safe source. * 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)) capable(CAP_FOWNER))
return 0; return 0;