From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 18 Apr 2015 23:10:36 +0000 (-0400)
Subject: link_path_walk: handle get_link() returning ERR_PTR() immediately
X-Git-Tag: MMI-PSA29.97-13-9~9766^2~123
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0c24c3bdf237182b2f043bfee68bf886b0c9ad3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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: Al Viro <viro@zeniv.linux.org.uk>
---

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