From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 210DE3AA187; Fri, 4 Sep 2026 05:43:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500596; cv=none; b=dgXohG4dqQZnhsNLa6G9G+3LlgEjpjQDfHhESJIzS1qvoF1q54VgSBvW/vM3aHWx+n+RXSCghTTSawZSkgjLHxjM6obcjQtLRmJzighe5VJh/HlEqtItV1adQyiVSJd0dHphYMtuHUdQHalZ5S3Ew+yar4GXNcAdUlnZoAgLBfk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500596; c=relaxed/simple; bh=UvmZUI5OJ0soYzyxX4P+EnF9OOTBcmsw9mhgJCsVQ6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z+2V1qoqovmAqT8fIvwc9dYf6+jNwHbFjtH/hC/RnEYsmnKeC35oCG5mSvJ7Ss6icYGdPkbYWrtNs3P/7dlyoIxNVsqOx4f9/+exD7U2cBgZuhij/k5ICsXOr6/kXe4To+o0dLJKbC42m7hFNwkAy53W48y31GBIkllaYhfpKt4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GTWpobRD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GTWpobRD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D4C81F00A3D; Fri, 4 Sep 2026 05:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500595; bh=1DaW8tpAnxaSN5DB33jpFg1ilkC2Om54x+/xtS58UrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GTWpobRDh3ggfjsWh94SHXfk4u9Daqugf0HOQlRH8WxOpbtwQtdDpkagm3rm7dRC/ QU8jX8A1zci+mWL1KvcXJVoFwswh4U3DZpDTJVvTMA2dyvU9jUqfAQ06VDre1V030F 8vP6ekXqxHY70afHGpu1I3gWZxxNacwqVSvHgIzo= 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 110/552] nfsd: return NFS4ERR_NOTSUPP for unsupported netloc4 types Date: Fri, 4 Sep 2026 06:54:27 +0200 Message-ID: <20260904045750.399713720@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Layton commit 45b06a75086f331f52cbb81223a59421d43f8809 upstream. nfsd4_decode_nl4_server() handled only NL4_NETADDR and returned nfserr_bad_xdr for NL4_NAME and NL4_URL. Those forms are well-formed XDR, so BADXDR is misleading -- the request is unsupported, not malformed. Decode and discard the utf8str_cis for NL4_NAME and NL4_URL to keep the stream consistent, and return nfserr_notsupp. nfsd4_proc_compound() honors a decode-time op->status, so the op fails without executing. Fixes: 84e1b21d5ec4 ("NFSD add ca_source_server<> to COPY") Cc: stable@vger.kernel.org Signed-off-by: Jeff Layton Link: https://patch.msgid.link/20260710-nfsd-testing-v3-7-a0ff7db6aa3e@kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4xdr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1969,6 +1969,7 @@ static __be32 nfsd4_decode_nl4_server(st { struct nfs42_netaddr *naddr; __be32 *p; + u32 str_len; if (xdr_stream_decode_u32(argp->xdr, &ns->nl4_type) < 0) return nfserr_bad_xdr; @@ -1998,6 +1999,18 @@ static __be32 nfsd4_decode_nl4_server(st return nfserr_bad_xdr; memcpy(naddr->addr, p, naddr->addr_len); break; + case NL4_NAME: + case NL4_URL: + /* + * Well-formed XDR, but only NL4_NETADDR is supported. Consume + * the utf8str_cis to keep the stream aligned, then return + * NFS4ERR_NOTSUPP rather than the misleading NFS4ERR_BADXDR. + */ + if (xdr_stream_decode_u32(argp->xdr, &str_len) < 0) + return nfserr_bad_xdr; + if (!xdr_inline_decode(argp->xdr, str_len)) + return nfserr_bad_xdr; + return nfserr_notsupp; default: return nfserr_bad_xdr; }