From: Chuck Lever <chuck.lever@oracle.com>
Date: Sun, 26 Jan 2025 21:50:17 +0000 (-0500)
Subject: NFSD: nfsd_unlink() clobbers non-zero status returned from fh_fill_pre_attrs()
X-Git-Tag: v6.15-rc1~88^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d8e3169b56e7696559a2427c922c0d55debcec;p=thirdparty%2Flinux.git

NFSD: nfsd_unlink() clobbers non-zero status returned from fh_fill_pre_attrs()

If fh_fill_pre_attrs() returns a non-zero status, the error flow
takes it through out_unlock, which then overwrites the returned
status code with

	err = nfserrno(host_err);

Fixes: a332018a91c4 ("nfsd: handle failure to collect pre/post-op attrs more sanely")
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 188c978a0c798..749dd84bdb419 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -2010,11 +2010,9 @@ out_nfserr:
 		 * error status.
 		 */
 		err = nfserr_file_open;
-	} else {
-		err = nfserrno(host_err);
 	}
 out:
-	return err;
+	return err != nfs_ok ? err : nfserrno(host_err);
 out_unlock:
 	inode_unlock(dirp);
 	goto out_drop_write;