diff mbox

[10/24] link_path_walk: handle get_link() returning ERR_PTR() immediately

Message ID 1429553588-24764-10-git-send-email-viro@ZenIV.linux.org.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Al Viro April 20, 2015, 6:12 p.m. UTC 
From: Al Viro <viro@zeniv.linux.org.uk>

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: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/namei.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/fs/namei.c b/fs/namei.c
index 48b2f17..6e6630c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1849,7 +1849,9 @@  static int link_path_walk(const char *name, struct nameidata *nd)
 
 				if (unlikely(IS_ERR(s))) {
 					err = PTR_ERR(s);
-					break;
+					nd->link_count--;
+					nd->depth--;
+					return err;
 				}
 				err = 0;
 				if (likely(s)) {