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 5C3492D8364; Sat, 12 Sep 2026 15:26:10 +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=1789226771; cv=none; b=H4vwA/oFSkr0TwevEztYLAU2HMMeqEaLbb0fkb8fX4aFLb6XGv9fYF6T/60ikS/QOq747nbjff61iTznQtvHtRAUtnYOdOa8c2Qr+KRVmR93mfz3m9OqtLp47+dQDIuWAFbGPbRClEigVaOzyiuwMEZz4o87e3L93nGdZUROrF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789226771; c=relaxed/simple; bh=pohlOHGENDph678s0LfrCocMbvaSMmy/36bCR5RamX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pu/ih8nlpubJLgltGRPYFlNtRa4REk0I2aZ2cY+tag7QXLOi5KhMJ0u2kj35qWd4ZPkMQg4WoL+eaiQBCfdJKGruFThBmyExPCuNN2eUa96PO3DU6OibUH/JgAqeT2nAZjJR2PBtWdb9ltaI7La7oZzO/CMb45JMAwiVgq/gEqs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=czm3hRFG; 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="czm3hRFG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA4891F000FF; Sat, 12 Sep 2026 15:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789226770; bh=iZAGRwyPepHIUq9AiT38HmtGj2ZuIKDqQdeGXOmXggQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=czm3hRFGD9ShEdoMHh7n7dqtxz+3L5Rjute3520j3v8sO4o4P36qTXteM+fvcFN87 GJj23Ou0WGTM2pz4C+rKmLHMB+q71X6bY4WHVd4MZBUxodOaxBlJp4OY8SLmJl1xDq j8Di6R0MzGAzBmMqVeSMUCyioJe29yVnLw9qusKo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Layton , Chuck Lever Subject: [PATCH 6.1 0044/1191] nfsd: return NFS4ERR_NOTSUPP for unsupported netloc4 types Date: Sat, 12 Sep 2026 08:46:12 +0200 Message-ID: <20260912065549.129432122@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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.1-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 @@ -1918,6 +1918,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; @@ -1947,6 +1948,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; }