Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

trailing_symlink: nd->depth massage, part 5

Browse Source 
move increment of ->depth to the point where we'd discovered
that get_link() has not returned an error, adjust exits
accordingly.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-03 20:59:58 -04:00
parent ef1a3e7b96
commit f7df08ee05
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/namei.c
View File

@ -2009,8 +2009,11 @@ static int trailing_symlink(struct nameidata *nd)
s = get_link(nd);
if (unlikely(IS_ERR(s)))
return PTR_ERR(s);
if (unlikely(!s))
nd->depth++;
if (unlikely(!s)) {
nd->depth--;
return 0;
}
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
@ -2020,12 +2023,14 @@ static int trailing_symlink(struct nameidata *nd)
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
nd->depth++;
error = link_path_walk(s, nd);
nd->depth--;
if (unlikely(error))
if (unlikely(error)) {
nd->depth--;
put_link(nd);
return error;
return error;
}
nd->depth--;
return 0;
}
static inline int lookup_last(struct nameidata *nd)