linux-kernel - [PATCH 14/24] link_path_walk: get rid of duplication

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1429553588-24764-14-git-send-email-viro@ZenIV.linux.org.uk>
Date:	Mon, 20 Apr 2015 19:12:58 +0100
From:	Al Viro <viro@...IV.linux.org.uk>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Neil Brown <neilb@...e.de>, linux-kernel@...r.kernel.org,
	linux-fsdevel@...r.kernel.org
Subject: [PATCH 14/24] link_path_walk: get rid of duplication

From: Al Viro <viro@...iv.linux.org.uk>

What we do after the second walk_component() + put_link() + depth
decrement in there is exactly equivalent to what's done right
after the first walk_component().  Easy to verify and not at all
surprising, seeing that there we have just walked the last
component of nested symlink.

Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
 fs/namei.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 06f1aa3..9cef3c0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1828,6 +1828,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			return 0;
 
 		err = walk_component(nd, &next, LOOKUP_FOLLOW);
+Walked:
 		if (err < 0)
 			return err;
 
@@ -1846,7 +1847,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			nd->depth++;
 			nd->link_count++;
 
-l:
 			link = next;
 			s = get_link(&link, nd, &cookie);
 
@@ -1883,13 +1883,7 @@ l:
 					put_link(nd, &link, cookie);
 					nd->link_count--;
 					nd->depth--;
-					if (err < 0)
-						return err;
-					if (err > 0) {
-						nd->link_count++;
-						nd->depth++;
-						goto l;
-					}
+					goto Walked;
 				}
 			}
 		}
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/