lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clear RCU on all failure exits from link_path_walk()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-03-04 14:28:10 -05:00
parent 9856fa1b28
commit 4455ca6223
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fs/namei.c
View File

@@ -1405,8 +1405,9 @@ static int link_path_walk(const char *name, struct nameidata *nd)
* parent relationships. * parent relationships.
*/ */
if (unlikely(type != LAST_NORM)) { if (unlikely(type != LAST_NORM)) {
if (handle_dots(nd, type)) err = handle_dots(nd, type);
return -ECHILD; if (err)
goto return_err;
continue; continue;
} }
@@ -1441,8 +1442,9 @@ last_component:
if (lookup_flags & LOOKUP_PARENT) if (lookup_flags & LOOKUP_PARENT)
goto lookup_parent; goto lookup_parent;
if (unlikely(type != LAST_NORM)) { if (unlikely(type != LAST_NORM)) {
if (handle_dots(nd, type)) err = handle_dots(nd, type);
return -ECHILD; if (err)
goto return_err;
return 0; return 0;
} }
err = do_lookup(nd, &this, &next, &inode); err = do_lookup(nd, &this, &next, &inode);
@@ -1475,6 +1477,12 @@ lookup_parent:
if (!(nd->flags & LOOKUP_RCU)) if (!(nd->flags & LOOKUP_RCU))
path_put(&nd->path); path_put(&nd->path);
return_err: return_err:
if (nd->flags & LOOKUP_RCU) {
nd->flags &= ~LOOKUP_RCU;
nd->root.mnt = NULL;
rcu_read_unlock();
br_read_unlock(vfsmount_lock);
}
return err; return err;
} }
@@ -1585,16 +1593,10 @@ static int path_lookupat(int dfd, const char *name,
retval = link_path_walk(name, nd); retval = link_path_walk(name, nd);
if (nd->flags & LOOKUP_RCU) { if (nd->flags & LOOKUP_RCU) {
/* RCU dangling. Cancel it. */ /* went all way through without dropping RCU */
if (!retval) { BUG_ON(retval);
if (nameidata_drop_rcu_last(nd)) if (nameidata_drop_rcu_last(nd))
retval = -ECHILD; retval = -ECHILD;
} else {
nd->flags &= ~LOOKUP_RCU;
nd->root.mnt = NULL;
rcu_read_unlock();
br_read_unlock(vfsmount_lock);
}
} }
if (!retval) if (!retval)