summaryrefslogtreecommitdiff
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-03 20:59:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-10 22:20:04 -0400
commitf7df08ee05db41c6d2ec498703401197f6b68373 (patch)
tree1cefb331d2b16bda8a58ad1c07483580bef65f71 /fs/namei.c
parentef1a3e7b9634cc68740eb1280309ac5e460b95f9 (diff)
trailing_symlink: nd->depth massage, part 5
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>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c
index cf5009b87c5a..5753f46d8321 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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)