From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D7D9C3F2CD for ; Sun, 1 Mar 2020 21:55:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 774E920CC7 for ; Sun, 1 Mar 2020 21:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727381AbgCAVyu (ORCPT ); Sun, 1 Mar 2020 16:54:50 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:41646 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727061AbgCAVwq (ORCPT ); Sun, 1 Mar 2020 16:52:46 -0500 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8WVw-003fOK-NW; Sun, 01 Mar 2020 21:52:44 +0000 From: Al Viro To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Linus Torvalds Subject: [RFC][PATCH v3 27/55] pick_link(): check for WALK_TRAILING, not LOOKUP_PARENT Date: Sun, 1 Mar 2020 21:52:12 +0000 Message-Id: <20200301215240.873899-27-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200301215240.873899-1-viro@ZenIV.linux.org.uk> References: <20200301215125.GA873525@ZenIV.linux.org.uk> <20200301215240.873899-1-viro@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index f994ed10ef39..56bbbb9c0c0d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1723,8 +1723,10 @@ static inline int handle_dots(struct nameidata *nd, int type) return 0; } +enum {WALK_TRAILING = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4}; + static const char *pick_link(struct nameidata *nd, struct path *link, - struct inode *inode, unsigned seq) + struct inode *inode, unsigned seq, int flags) { struct saved *last; const char *res; @@ -1762,7 +1764,7 @@ static const char *pick_link(struct nameidata *nd, struct path *link, clear_delayed_call(&last->done); last->seq = seq; - if (!(nd->flags & LOOKUP_PARENT)) { + if (flags & WALK_TRAILING) { error = may_follow_link(nd, inode); if (unlikely(error)) return ERR_PTR(error); @@ -1819,8 +1821,6 @@ static const char *pick_link(struct nameidata *nd, struct path *link, return NULL; } -enum {WALK_TRAILING = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4}; - /* * Do we need to follow links? We _really_ want to be able * to do this check without having to look at inode->i_op, @@ -1851,7 +1851,7 @@ static const char *step_into(struct nameidata *nd, int flags, if (read_seqcount_retry(&path.dentry->d_seq, seq)) return ERR_PTR(-ECHILD); } - return pick_link(nd, &path, inode, seq); + return pick_link(nd, &path, inode, seq, flags); } static const char *walk_component(struct nameidata *nd, int flags) -- 2.11.0