Commit b0c24c3b authored by Al Viro's avatar Al Viro

link_path_walk: handle get_link() returning ERR_PTR() immediately

If we get ERR_PTR() from get_link(), we are guaranteed to get err != 0
when we break out of do-while, so we are going to hit if (err) return err;
shortly after it.  Pull that into the if (IS_ERR(s)) body.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 95fa25d9
...@@ -1792,7 +1792,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1792,7 +1792,9 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (unlikely(IS_ERR(s))) { if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s); err = PTR_ERR(s);
break; current->link_count--;
nd->depth--;
return err;
} }
err = 0; err = 0;
if (likely(s)) { if (likely(s)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment