diff mbox series

[4.14,32/45] NFS: LOOKUP_DIRECTORY is also ok with symlinks

Message ID	20220221084911.484705085@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Paul Menzel <pmenzel@molgen.mpg.de>, Trond Myklebust <trond.myklebust@hammerspace.com>, Donald Buczek <buczek@molgen.mpg.de>, Anna Schumaker <Anna.Schumaker@Netapp.com> Subject: [PATCH 4.14 32/45] NFS: LOOKUP_DIRECTORY is also ok with symlinks Date: Mon, 21 Feb 2022 09:49:23 +0100 Message-Id: <20220221084911.484705085@linuxfoundation.org> In-Reply-To: <20220221084910.454824160@linuxfoundation.org> References: <20220221084910.454824160@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.14,03/45] serial: parisc: GSC: fix build when IOSAPIC is not set [4.14,05/45] parisc: Fix sglist access in ccio-dma.c [4.14,08/45] selftests/zram: Skip max_comp_streams interface on newer kernel [4.14,09/45] selftests/zram01.sh: Fix compression ratio calculation [4.14,12/45] vfs: make freeze_super abort when sync_filesystem returns error [4.14,13/45] quota: make dquot_quota_sync return errors from ->sync_fs [4.14,15/45] iwlwifi: fix use-after-free [4.14,17/45] xfrm: Dont accidentally set RTO_ONLINK in decode_session4() [4.14,19/45] vsock: remove vsock from connected table when connect is interrupted by a signal [4.14,20/45] iwlwifi: pcie: fix locking when "HW not ready" [4.14,24/45] drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit [4.14,26/45] libsubcmd: Fix use-after-free for realloc(..., 0) [4.14,28/45] ALSA: hda: Fix missing codec probe on Shenker Dock 15 [4.14,32/45] NFS: LOOKUP_DIRECTORY is also ok with symlinks [4.14,33/45] EDAC: Fix calculation of returned address and next offset in edac_align_ptr() [4.14,35/45] dmaengine: sh: rcar-dmac: Check for error num after setting mask [4.14,36/45] i2c: brcmstb: fix support for DSL and CM variants [4.14,39/45] KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW [4.14,40/45] NFS: Do not report writeback errors in nfs_getattr() [4.14,41/45] ARM: OMAP2+: hwmod: Add of_node_put() before break [4.14,42/45] ata: libata-core: Disable TRIM on M88V29 [4.14,43/45] tracing: Fix tp_printk option related with tp_printk_stop_on_boot [4.14,45/45] net: macb: Align the dma and coherent dma masks

Commit Message

Greg KH Feb. 21, 2022, 8:49 a.m. UTC

From: Trond Myklebust <trond.myklebust@hammerspace.com>

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 <pmenzel@molgen.mpg.de>
Fixes: ac795161c936 ("NFSv4: Handle case where the lookup of a directory fails")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Donald Buczek <buczek@molgen.mpg.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/nfs/dir.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1610,14 +1610,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)) {