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

[ Upstream commit d7d8e3169b56e7696559a2427c922c0d55debcec ]

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>
[ Slightly different error mapping ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 58580eb6cf929ab6b9be226ca195da64d844b7a5..5ee7149ceaa5a7d640619f2eff0d5f74ccfd2063 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1970,11 +1970,9 @@ out_nfserr:
                        err = nfserr_file_open;
                else
                        err = nfserr_acces;
-       } 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;