Re: [PATCH v1 1/2] NFSD: map fh_verify() status codes for NFS_ACLv2 replies

[Jeff Layton <jlayton@kernel.org>]

On Wed, 2026-09-16 at 12:28 -0400, Chuck Lever wrote:
> The NFS_ACL v2 protocol shares its status code space with NFSv2,
> which has no NFSERR_BADHANDLE and no NFSERR_NOFILEHANDLE. An
> NFS_ACLv2 GETACL, SETACL, GETATTR, or ACCESS request that carries a
> malformed or empty file handle gets a reply with status 10001 or
> 10020, values the client cannot interpret.
> 
> Commit 1459ad57673b ("nfsd: Move error code mapping to per-version
> proc code.") removed the version check from fh_verify() that turned
> those codes into NFSERR_STALE for any version 2 program. The NFSv2
> procedures gained nfsd_map_status() in exchange, but the NFS_ACL v2
> procedures did not, so the unmapped status reaches the encoder.
> 
> Add the same mapping to the NFS_ACL v2 procedures.
> 
> Fixes: 1459ad57673b ("nfsd: Move error code mapping to per-version proc code.")
> Signed-off-by: Chuck Lever <cel@kernel.org>
> ---
>  fs/nfsd/nfs2acl.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
> index 0a5c444fef99..0673e83b6666 100644
> --- a/fs/nfsd/nfs2acl.c
> +++ b/fs/nfsd/nfs2acl.c
> @@ -59,6 +59,20 @@ static const struct nfsd_access_maps nfsd2_access_maps = {
>  	.other		= nfsd2_otheraccess,
>  };
>  
> +static __be32 nfsacld_map_status(__be32 status)
> +{
> +	switch (status) {
> +	case nfserr_nofilehandle:
> +	case nfserr_badhandle:
> +		status = nfserr_stale;
> +		break;
> +	case nfserr_wrongsec:
> +		status = nfserr_acces;
> +		break;
> +	}
> +	return status;
> +}
> +
>  /*
>   * NULL call.
>   */
> @@ -123,6 +137,7 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst *rqstp)
>  
>  	/* resp->acl_{access,default} are released in nfssvc_release_getacl. */
>  out:
> +	resp->status = nfsacld_map_status(resp->status);
>  	return rpc_success;
>  
>  fail:
> @@ -181,6 +196,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)
>  
>  out:
>  	/* argp->acl_{access,default} are released in nfsaclsvc_release_setacl. */
> +	resp->status = nfsacld_map_status(resp->status);
>  	return rpc_success;
>  
>  out_drop_lock:
> @@ -207,6 +223,7 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst *rqstp)
>  		goto out;
>  	resp->status = fh_getattr(&resp->fh, &resp->stat);
>  out:
> +	resp->status = nfsacld_map_status(resp->status);
>  	return rpc_success;
>  }
>  
> @@ -231,6 +248,7 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp)
>  		goto out;
>  	resp->status = fh_getattr(&resp->fh, &resp->stat);
>  out:
> +	resp->status = nfsacld_map_status(resp->status);
>  	return rpc_success;
>  }
>  

Reviewed-by: Jeff Layton <jlayton@kernel.org>