Skip to content

Commit

Permalink
vfs: fix BUG_ON() in fs/namei.c:1461
Browse files Browse the repository at this point in the history
When Al moved the nameidata_dentry_drop_rcu_maybe() call into the
do_follow_link function in commit 844a391 ("nothing in
do_follow_link() is going to see RCU"), he mistakenly left the

	BUG_ON(inode != path->dentry->d_inode);

behind.  Which would otherwise be ok, but that BUG_ON() really needs to
be _after_ dropping RCU, since the dentry isn't necessarily stable
otherwise.

So complete the code movement in that commit, and move the BUG_ON() into
do_follow_link() too.  This means that we need to pass in 'inode' as an
argument (just for this one use), but that's a small thing.  And
eventually we may be confident enough in our path lookup that we can
just remove the BUG_ON() and the unnecessary inode argument.

Reported-and-tested-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Linus Torvalds committed Feb 16, 2011
1 parent 85e2efb commit 3abb17e
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,15 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
* Without that kind of total limit, nasty chains of consecutive
* symlinks can cause almost arbitrarily long lookups.
*/
static inline int do_follow_link(struct path *path, struct nameidata *nd)
static inline int do_follow_link(struct inode *inode, struct path *path, struct nameidata *nd)
{
void *cookie;
int err = -ELOOP;

/* We drop rcu-walk here */
if (nameidata_dentry_drop_rcu_maybe(nd, path->dentry))
return -ECHILD;
BUG_ON(inode != path->dentry->d_inode);

if (current->link_count >= MAX_NESTED_LINKS)
goto loop;
Expand Down Expand Up @@ -1413,8 +1414,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
goto out_dput;

if (inode->i_op->follow_link) {
BUG_ON(inode != next.dentry->d_inode);
err = do_follow_link(&next, nd);
err = do_follow_link(inode, &next, nd);
if (err)
goto return_err;
nd->inode = nd->path.dentry->d_inode;
Expand Down Expand Up @@ -1458,8 +1458,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
break;
if (inode && unlikely(inode->i_op->follow_link) &&
(lookup_flags & LOOKUP_FOLLOW)) {
BUG_ON(inode != next.dentry->d_inode);
err = do_follow_link(&next, nd);
err = do_follow_link(inode, &next, nd);
if (err)
goto return_err;
nd->inode = nd->path.dentry->d_inode;
Expand Down

0 comments on commit 3abb17e

Please sign in to comment.