Skip to content

Commit

Permalink
vfs: make follow_link check RCU safe
Browse files Browse the repository at this point in the history
This will allow this code to be used in RCU mode.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Miklos Szeredi authored and Al Viro committed Jun 1, 2012
1 parent decf340 commit d45ea86
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2201,6 +2201,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
int acc_mode = op->acc_mode;
struct file *filp;
struct inode *inode;
int symlink_ok = 0;
int error;

nd->flags &= ~LOOKUP_PARENT;
Expand Down Expand Up @@ -2232,7 +2233,6 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
}

if (!(open_flag & O_CREAT)) {
int symlink_ok = 0;
if (nd->last.name[nd->last.len])
nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
if (open_flag & O_PATH && !(nd->flags & LOOKUP_FOLLOW))
Expand Down Expand Up @@ -2364,8 +2364,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (!inode)
goto exit_dput;

if (inode->i_op->follow_link)
if (should_follow_link(inode, !symlink_ok)) {
if (nd->flags & LOOKUP_RCU) {
if (unlikely(unlazy_walk(nd, path->dentry))) {
error = -ECHILD;
goto exit;
}
}
BUG_ON(inode != path->dentry->d_inode);
return NULL;
}

path_to_nameidata(path, nd);
nd->inode = inode;
Expand Down

0 comments on commit d45ea86

Please sign in to comment.