commit b5cd3397627ab7e200ee068ca39b9ca2d031f26d
author Al Viro <viro@zeniv.linux.org.uk> Fri May 08 16:38:31 2015 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sun May 10 22:20:20 2015 -0400
tree a923b90c4be1bb31c570658a68dfafd7a176794a
parent ab10492345d1d629743c7e7d56532f4e5284c2c5

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

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

fs/namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 6d4692d..51e2214 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -798,7 +798,6 @@
 		return 0;
 
 	audit_log_link_denied("follow_link", &nd->stack[0].link);
-	terminate_walk(nd);
 	return -EACCES;
 }
 
@@ -1980,8 +1979,10 @@
 {
 	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);