Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755630AbbEKS2F (ORCPT ); Mon, 11 May 2015 14:28:05 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47235 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754973AbbEKSIW (ORCPT ); Mon, 11 May 2015 14:08:22 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 056/110] trailing_symlink: nd->depth massage, part 5 Date: Mon, 11 May 2015 19:07:16 +0100 Message-Id: <1431367690-5223-56-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150511180650.GA4147@ZenIV.linux.org.uk> References: <20150511180650.GA4147@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1372 Lines: 55 From: Al Viro move increment of ->depth to the point where we'd discovered that get_link() has not returned an error, adjust exits accordingly. Signed-off-by: Al Viro --- fs/namei.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index cf5009b..5753f46 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2009,8 +2009,11 @@ static int trailing_symlink(struct nameidata *nd) s = get_link(nd); if (unlikely(IS_ERR(s))) return PTR_ERR(s); - if (unlikely(!s)) + nd->depth++; + if (unlikely(!s)) { + nd->depth--; return 0; + } if (*s == '/') { if (!nd->root.mnt) set_root(nd); @@ -2020,12 +2023,14 @@ static int trailing_symlink(struct nameidata *nd) nd->flags |= LOOKUP_JUMPED; } nd->inode = nd->path.dentry->d_inode; - nd->depth++; error = link_path_walk(s, nd); - nd->depth--; - if (unlikely(error)) + if (unlikely(error)) { + nd->depth--; put_link(nd); - return error; + return error; + } + nd->depth--; + return 0; } static inline int lookup_last(struct nameidata *nd) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/