Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/viro/vfs

Pull RCU pathwalk fix from Al Viro:
 "Another racy use of nd->path.dentry in RCU mode"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  may_follow_link() should use nd->inode
  • Loading branch information
Linus Torvalds committed Aug 10, 2015
2 parents f7644cb + aa65fa3 commit a3ca013
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ static inline int may_follow_link(struct nameidata *nd)
return 0;

/* Allowed if parent directory not sticky and world-writable. */
parent = nd->path.dentry->d_inode;
parent = nd->inode;
if ((parent->i_mode & (S_ISVTX|S_IWOTH)) != (S_ISVTX|S_IWOTH))
return 0;

Expand Down

0 comments on commit a3ca013

Please sign in to comment.