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

may_follow_link(): trim arguments

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-06 15:58:18 -04:00
parent cd179f4468
commit fec2fa24e8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/namei.c
View File

@ -765,7 +765,6 @@ int sysctl_protected_hardlinks __read_mostly = 0;
/** /**
* may_follow_link - Check symlink following for unsafe situations * may_follow_link - Check symlink following for unsafe situations
* @link: The path of the symlink
* @nd: nameidata pathwalk data * @nd: nameidata pathwalk data
* *
* In the case of the sysctl_protected_symlinks sysctl being enabled, * In the case of the sysctl_protected_symlinks sysctl being enabled,
@ -779,7 +778,7 @@ int sysctl_protected_hardlinks __read_mostly = 0;
* *
* Returns 0 if following the symlink is allowed, -ve on error. * Returns 0 if following the symlink is allowed, -ve on error.
*/ */
static inline int may_follow_link(struct path *link, struct nameidata *nd) static inline int may_follow_link(struct nameidata *nd)
{ {
const struct inode *inode; const struct inode *inode;
const struct inode *parent; const struct inode *parent;
@ -788,7 +787,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
return 0; return 0;
/* Allowed if owner and follower match. */ /* Allowed if owner and follower match. */
inode = link->dentry->d_inode; inode = nd->link.dentry->d_inode;
if (uid_eq(current_cred()->fsuid, inode->i_uid)) if (uid_eq(current_cred()->fsuid, inode->i_uid))
return 0; return 0;
@ -801,8 +800,8 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
if (uid_eq(parent->i_uid, inode->i_uid)) if (uid_eq(parent->i_uid, inode->i_uid))
return 0; return 0;
audit_log_link_denied("follow_link", link); audit_log_link_denied("follow_link", &nd->link);
path_put(link); path_put(&nd->link);
path_put(&nd->path); path_put(&nd->path);
return -EACCES; return -EACCES;
} }
@ -1985,7 +1984,7 @@ static void path_cleanup(struct nameidata *nd)
static int trailing_symlink(struct nameidata *nd) static int trailing_symlink(struct nameidata *nd)
{ {
const char *s; const char *s;
int error = may_follow_link(&nd->link, nd); int error = may_follow_link(nd);
if (unlikely(error)) if (unlikely(error))
return error; return error;
nd->flags |= LOOKUP_PARENT; nd->flags |= LOOKUP_PARENT;