From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADCF51DF27F; Tue, 8 Apr 2025 11:37:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112245; cv=none; b=Qmm42oImlDrIBQZrRp289YdDr3p5BRh43G9vvkIAmTh+VlCCMBotYleS6WVvSHdcNvflfqRY5vN0BhCHD0+d1BkTLgl3QBCWbiUTcq+HQl87CzTwTWFx8vUJ6Z8H0Zy/80x5nBUCVxklqc23cD1gRQeWnq9nMc+Dn56JqjJIyeI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112245; c=relaxed/simple; bh=6qBXL6ZPuR/q4rPJF3HOYnpIte2hrBzlyocsBdvcIZo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fpCLzAYXGdegd9Avs875eqQmEGFllU1RlUT3/YHEFxeQ9rw6LnnPjzqDxn1rbfK0GNV4J66yhyr6Mj6HLWMR5oubXaDGHg7ycJQnsFQrswi6TCj/VdCdeYrvV04jqbNINjvmG1woUJYV/UWPPiTGR5HpzcnymXTyC3Fj8aNjM64= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FYMCDvPD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FYMCDvPD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 359ABC4CEE5; Tue, 8 Apr 2025 11:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112245; bh=6qBXL6ZPuR/q4rPJF3HOYnpIte2hrBzlyocsBdvcIZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FYMCDvPD5T7f1XB0q4Llc6C3v7dISjg+iXBShnB4YEtv6Ivin6ilyAVG2pIFRzKh1 k0+icO3jboIpzcBjOpUYAN+6BLwPiAtWndCn3+RS/ADLJ8lQRe4NSWuvrT76Q+qCAX 6NiqFOF/ZbfbUZjDOZy7CrXpWA17bC4523x+KcBE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Trond Myklebust , Jeff Layton , Chuck Lever Subject: [PATCH 6.14 730/731] NFSD: Never return NFS4ERR_FILE_OPEN when removing a directory Date: Tue, 8 Apr 2025 12:50:27 +0200 Message-ID: <20250408104931.253045151@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit 370345b4bd184a49ac68d6591801e5e3605b355a upstream. RFC 8881 Section 18.25.4 paragraph 5 tells us that the server should return NFS4ERR_FILE_OPEN only if the target object is an opened file. This suggests that returning this status when removing a directory will confuse NFS clients. This is a version-specific issue; nfsd_proc_remove/rmdir() and nfsd3_proc_remove/rmdir() already return nfserr_access as appropriate. Unfortunately there is no quick way for nfsd4_remove() to determine whether the target object is a file or not, so the check is done in in nfsd_unlink() for now. Reported-by: Trond Myklebust Fixes: 466e16f0920f ("nfsd: check for EBUSY from vfs_rmdir/vfs_unink.") Reviewed-by: Jeff Layton Cc: stable@vger.kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/vfs.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1931,9 +1931,17 @@ out: return err; } -/* - * Unlink a file or directory - * N.B. After this call fhp needs an fh_put +/** + * nfsd_unlink - remove a directory entry + * @rqstp: RPC transaction context + * @fhp: the file handle of the parent directory to be modified + * @type: enforced file type of the object to be removed + * @fname: the name of directory entry to be removed + * @flen: length of @fname in octets + * + * After this call fhp needs an fh_put. + * + * Returns a generic NFS status code in network byte-order. */ __be32 nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, @@ -2007,10 +2015,14 @@ out_drop_write: fh_drop_write(fhp); out_nfserr: if (host_err == -EBUSY) { - /* name is mounted-on. There is no perfect - * error status. + /* + * See RFC 8881 Section 18.25.4 para 4: NFSv4 REMOVE + * wants a status unique to the object type. */ - err = nfserr_file_open; + if (type != S_IFDIR) + err = nfserr_file_open; + else + err = nfserr_acces; } out: return err != nfs_ok ? err : nfserrno(host_err);