From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793831763; b=GRKqp97beO5wulWAQ1CZk1akHaDHYr7TXashV1sznBN3hlpwCI7ISouZuxZZdICo6Xwe e2f3lCsMw1fCBGFU8Frsl2xfPv6XmvXNIa4dCalm8rg66fU/Mur2SeuxzXJWesKiuhUhi erChQYZuCLFbF1colMYHiRE1HqfI0AzfILiEZOLGxFP8cH9mQMZdLDfIOWN0dOvTXg6gy kHAZxz8ie30spcuO5mA7zeyVJi42beakFk1gZ9kgpbofKEd39Dj/IWj5HtFynOLI7AFNZ fKjZfR2DzFuTL1MKjGfKL08wE9431lfJkZWdhkRq/NVGpaOX8WZ92JUiHViOmNxaAeQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831763; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=MX8VESnzcvy4+Mr7dqif1jbRe5/bmHTxcyhQ0ekfCrU=; b=iOwuDRfAmSbxfK5vI+BUOvKUtoiWPpMrI2PfohBNYZ1kCiIsb3bXqJdcFjSwUPL5VopF 5EcrMSgg6s+azu7p4OAc1Ph6dRvvsABiYXG5PIIToWUIbKHGVbHFZ4gy9YG3s8XQbPWpL BTxL1omGPJcQUS/wxOOj0hS4myVBeS5qlPKKvW2/AKvjzBVqJeeQcFUGS8VGyymperRPI 0JM3rvsuVlIwhIz+goZGFwPz21uerYMTfgRv3UpMiIryLbr+aJZcGblydotDfcsIJQlhw nVarce3ZbWqehkOB7htsiLIYheDmbwibymhvdHU5fabYe6m1KnLE8qrM4lymvL/6XAA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zdKeLucM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1FB4606A31B; Wed, 4 Nov 2026 22:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zdKeLucM Received: by smtp.kernel.org (Postfix) with ESMTPSA id 623C81F00919; Wed, 4 Nov 2026 22:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831762; bh=MX8VESnzcvy4+Mr7dqif1jbRe5/bmHTxcyhQ0ekfCrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zdKeLucMdJrYMion89moKRIgKUtgahOiG0l3wz9yMRL3DwyT5rmcniwBGXTSGw+1s 3DZ+YHXrKdqlVrmF3RxMB3kmmmYXaLrUEbFo91XFtbnj9gkWz12Li79ZkHqmt2/6Dp yPDODxeXVkSJ6TP2iQ9RIpTIS02DMIggEKv7IN5k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Layton , Chuck Lever Subject: [PATCH 6.18 0897/1005] NFSD: map fh_verify() status codes for NFS_ACLv3 replies Date: Wed, 4 Nov 2026 16:10:30 -0500 Message-ID: <20261104211108.331911162@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit b1eb9f1aea88a0d7ec8116a70c33b7b31ad0a3eb upstream. The NFS_ACLv3 protocol shares its status code space with NFSv3, which has NFS3ERR_BADHANDLE but no NFSERR_NOFILEHANDLE. An NFS_ACLv3 GETACL or SETACL request that carries an empty file handle gets a reply with status 10020, a value the client cannot interpret. Commit 1459ad57673b ("nfsd: Move error code mapping to per-version proc code.") made fh_verify() return nfserr_nofilehandle for an empty handle regardless of protocol version. The NFSv3 procedures gained nfsd3_map_status() in exchange, but the NFS_ACLv3 procedures did not, so the unmapped status reaches the encoder. Add the same mapping to the NFS_ACLv3 procedures. Fixes: 1459ad57673b ("nfsd: Move error code mapping to per-version proc code.") Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton Link: https://patch.msgid.link/20260916004240.141975-2-cel@kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs3acl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c @@ -13,6 +13,19 @@ #include "xdr3.h" #include "vfs.h" +static __be32 nfsd3_map_status(__be32 status) +{ + switch (status) { + case nfserr_nofilehandle: + status = nfserr_badhandle; + break; + case nfserr_wrongsec: + status = nfserr_acces; + break; + } + return status; +} + /* * NULL call. */ @@ -71,6 +84,7 @@ static __be32 nfsd3_proc_getacl(struct s /* resp->acl_{access,default} are released in nfs3svc_release_getacl. */ out: + resp->status = nfsd3_map_status(resp->status); return rpc_success; fail: @@ -124,6 +138,7 @@ out_errno: resp->status = nfserrno(error); out: /* argp->acl_{access,default} are released in nfs3svc_release_setacl. */ + resp->status = nfsd3_map_status(resp->status); return rpc_success; }