Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp3628080pxb; Mon, 21 Feb 2022 02:13:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjkKY4LHx6hIQKZ2WgHDYwe9sBichxZmsGryiXCpRBFJ/Bz5y1Fx+KwmJebPG5swLvjjm1 X-Received: by 2002:a05:6402:70d:b0:410:ba4d:736f with SMTP id w13-20020a056402070d00b00410ba4d736fmr20206607edx.0.1645438395141; Mon, 21 Feb 2022 02:13:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645438395; cv=none; d=google.com; s=arc-20160816; b=Z1/iL/cRqjf+bn8sV1fdKZYe/cWHZ5PM0zIbjG8Ix2Q+vPdXwv6L5y136QUkqDxu8I ucj3CV+WKnFo+MvSi0SysTKWY3DwZ8f/wuIs4/9Cj2cod3upmpXIxIVrYlk2CnaE5UV5 2ZXgV3bc7vhO0pufi1Lock64AvBTsWNA4DM8qdPgQhc+scE1awSfbVfPdLIjYOcgJ8yH QVgiSvlji7mjyjvV4LWZZOf/vpD8oivP9IDHGQ7qhIaP97rgn65ggAIHK9p9VbaUE0n2 Nu8uyo2TxtbE/6Z0tvSTDBBtdLvDn0rT6v/TAxehpzbfcntlx+7e7f6UkQCq1AF9GjU3 umXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8iaCo0iUmLYiYZysck97f7EYp0rk1UF8/oGhLa7Hi8k=; b=Q+UixZUDuEv8auIx3jxlmjjBAf/KPV2DtIOfxKQHgYdXyfKiYVPPsQuxFYpqu0v4vr eYnWEXuZdoyst5RSnVmWUEpfUqS2pKHv90ZjDCdHHxldt1DOMQx+m3gVV6illy2b7tjx UnII+qvP3ZmgkiF3GVuVMhXaAXXH9gj0eFrxNJ3rNucES+1ueBObBjWEvGlC8wNaMYb7 vqRJMvQjk6RYuPadumzpyOFzq3fvQI66O0R3FVF1Vd2qC4fQqOy0fhYybzqAqyncnnSi aV6XgjjrSBpLJKneFcLPxcrMkmgEPE8Q4wYC4K5DogPB3cFVdZsJC86ch9U2/6bO0e2K 72Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=T2yp1pRp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k7si6949839ejj.396.2022.02.21.02.12.52; Mon, 21 Feb 2022 02:13:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=T2yp1pRp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345621AbiBUIxP (ORCPT + 99 others); Mon, 21 Feb 2022 03:53:15 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345615AbiBUIwu (ORCPT ); Mon, 21 Feb 2022 03:52:50 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A45CE49; Mon, 21 Feb 2022 00:52:17 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AD0016113E; Mon, 21 Feb 2022 08:52:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91D18C340E9; Mon, 21 Feb 2022 08:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433536; bh=bLYGSPg5pngi8ECVVjxmJsAUVouNH0aHvZNl9/486ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2yp1pRpB4IUX/53O1xqMR0DicSGM9RbNPHvfpp2RNdnH3dsZEWKNRYSjidvWB3m5 Q1T91aTauv6TK4sT+PWrTW+gVBgm7bKfgteJoHR6ZwZ47qvq11Hha7ZoHv1YYeIxpL o+CHoD96/IcuLTMPI7ETnLd60NiFBY5yavBq5io4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Menzel , Trond Myklebust , Donald Buczek , Anna Schumaker Subject: [PATCH 4.9 26/33] NFS: LOOKUP_DIRECTORY is also ok with symlinks Date: Mon, 21 Feb 2022 09:49:19 +0100 Message-Id: <20220221084909.615332672@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084908.568970525@linuxfoundation.org> References: <20220221084908.568970525@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit e0caaf75d443e02e55e146fd75fe2efc8aed5540 upstream. Commit ac795161c936 (NFSv4: Handle case where the lookup of a directory fails) [1], part of Linux since 5.17-rc2, introduced a regression, where a symbolic link on an NFS mount to a directory on another NFS does not resolve(?) the first time it is accessed: Reported-by: Paul Menzel Fixes: ac795161c936 ("NFSv4: Handle case where the lookup of a directory fails") Signed-off-by: Trond Myklebust Tested-by: Donald Buczek Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1605,14 +1605,14 @@ no_open: if (!res) { inode = d_inode(dentry); if ((lookup_flags & LOOKUP_DIRECTORY) && inode && - !S_ISDIR(inode->i_mode)) + !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) res = ERR_PTR(-ENOTDIR); else if (inode && S_ISREG(inode->i_mode)) res = ERR_PTR(-EOPENSTALE); } else if (!IS_ERR(res)) { inode = d_inode(res); if ((lookup_flags & LOOKUP_DIRECTORY) && inode && - !S_ISDIR(inode->i_mode)) { + !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) { dput(res); res = ERR_PTR(-ENOTDIR); } else if (inode && S_ISREG(inode->i_mode)) {