From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 8 May 2015 20:38:31 +0000 (-0400)
Subject: namei: may_follow_link() - lift terminate_walk() on failures into caller
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b5cd3397627ab7e200ee068ca39b9ca2d031f26d;p=openwrt%2Fstaging%2Fblogic.git

namei: may_follow_link() - lift terminate_walk() on failures into caller

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/namei.c b/fs/namei.c
index 6d4692d772f7..51e2214e820d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -798,7 +798,6 @@ static inline int may_follow_link(struct nameidata *nd)
 		return 0;
 
 	audit_log_link_denied("follow_link", &nd->stack[0].link);
-	terminate_walk(nd);
 	return -EACCES;
 }
 
@@ -1980,8 +1979,10 @@ static int trailing_symlink(struct nameidata *nd)
 {
 	const char *s;
 	int error = may_follow_link(nd);
-	if (unlikely(error))
+	if (unlikely(error)) {
+		terminate_walk(nd);
 		return error;
+	}
 	nd->flags |= LOOKUP_PARENT;
 	nd->stack[0].name = NULL;
 	s = get_link(nd);