From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 28 Feb 2016 00:37:37 +0000 (-0500)
Subject: do_last(): ELOOP failure exit should be done after leaving RCU mode
X-Git-Tag: v4.4.14-KARO~1071
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d57c0477f842af4fdcfa93454bc2ad94d73b7158;p=karo-tx-linux.git

do_last(): ELOOP failure exit should be done after leaving RCU mode

commit 5129fa482b16615fd4464d2f5d23acb1b7056c66 upstream.

... or we risk seeing a bogus value of d_is_symlink() there.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/namei.c b/fs/namei.c
index 930b51d6308b..d8ee4da93650 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3149,11 +3149,6 @@ finish_lookup:
 	if (unlikely(error))
 		return error;
 
-	if (unlikely(d_is_symlink(path.dentry)) && !(open_flag & O_PATH)) {
-		path_to_nameidata(&path, nd);
-		return -ELOOP;
-	}
-
 	if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path.mnt) {
 		path_to_nameidata(&path, nd);
 	} else {
@@ -3172,6 +3167,10 @@ finish_open:
 		return error;
 	}
 	audit_inode(nd->name, nd->path.dentry, 0);
+	if (unlikely(d_is_symlink(nd->path.dentry)) && !(open_flag & O_PATH)) {
+		error = -ELOOP;
+		goto out;
+	}
 	error = -EISDIR;
 	if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
 		goto out;