commit f488443d1dc50454acd549ddd856421e8f961f98
author Al Viro <viro@zeniv.linux.org.uk> Wed Apr 22 11:27:43 2015 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sun May 10 22:18:30 2015 -0400
tree 18947387d8ff7d64985ddcd09adcfb2a2a61b24f
parent 34b128f31c028a28887c6659e90620727a319b16

namei: take O_NOFOLLOW treatment into do_last()

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

fs/namei.c

diff --git a/fs/namei.c b/fs/namei.c
index a77f9ca..4c1a8bf 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3059,6 +3059,11 @@
 			}
 		}
 		BUG_ON(inode != path->dentry->d_inode);
+		if (!(nd->flags & LOOKUP_FOLLOW)) {
+			path_put_conditional(path, nd);
+			path_put(&nd->path);
+			return -ELOOP;
+		}
 		return 1;
 	}
 
@@ -3243,12 +3248,6 @@
 	while (unlikely(error > 0)) { /* trailing symlink */
 		struct path link = path;
 		void *cookie;
-		if (!(nd->flags & LOOKUP_FOLLOW)) {
-			path_put_conditional(&path, nd);
-			path_put(&nd->path);
-			error = -ELOOP;
-			break;
-		}
 		error = may_follow_link(&link, nd);
 		if (unlikely(error))
 			break;