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 45BE13D9670 for ; Wed, 9 Sep 2026 09:26:40 +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=1788946001; cv=none; b=o7Kw2jiWFxz6jMMbhuR8/VUiJ7vZz4FhHWiRpTMg6eIgWE3RED+7WvCHmUqN3UvBC0NEhFgccbTTaz2+pmV0/9g2Wi2fIkBVsv3a5lJ9EcsnnxPXcn7X7bUGXCP7g8xUXbJhoEh6fO3hNIBDLNmogT8p6ZadtYEld2iWfPnsGYE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788946001; c=relaxed/simple; bh=MeHwwqb0DXP0tcIZd2Z4s0N/LqSCQgBAzEVMay28evc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uy4an9LX4dC44DcKQPbtsZ+Z5uM2YF33Hz2KQOtpGrpPO8kyHr6F8ZFq+PlBEUOTlNiivaSENFMTe3dl1l85Ys6cgLPgCaoUjOFD99FpmxsF2oHnBZdum/I6qcFw0HioU4JJvyOegxwvA7+aA6XJm5ThAyRcMLy2rtBz9+wZ1fQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z+DDrPbr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z+DDrPbr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50A6A1F00A3E; Wed, 9 Sep 2026 09:26:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788945999; bh=tpHkloecV76HgS1lbDU2HAwi5ZmfAprxZCxUnFInzJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z+DDrPbrJMxocgZpzW9jh9oGtOCEjst0Jb4UunUYIqqgBjuL74VvEBK4ZxY2VbB6w glFRNwgvfv+OcOd6gweH6xnbkeWVP+LcbH8QWq18hKOtD7nBCrVJtBxBy9bkiiWSXf gtHF01wTuCFzvhsfYYTudvvRJ3El7g7SeItz302ureIcoUroWH1TrucIHnYOUKgdE+ NzG0OIJQJ6k/UwmiYmalnvoFq3y5OgMApaVHiFPdjh/pSwygy1XT0hUfMVw9QfeTY4 YyWqAMtjjZSdo/KJGpDzykemepwnBOn51GzOWkrhFy4uvIi2qNkO0E7fuDlK5LLg4T 8pMrjwSU/ydOA== From: Sasha Levin To: stable@vger.kernel.org Cc: Chris Mason , Jeff Layton , Chuck Lever , Sasha Levin Subject: [PATCH 6.1.y 3/3] svcrdma: Reject Write/Reply chunks with segcount 0 Date: Wed, 9 Sep 2026 05:26:36 -0400 Message-ID: <20260909092636.1296906-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909092636.1296906-1-sashal@kernel.org> References: <2026090343-runway-amaretto-1501@gregkh> <20260909092636.1296906-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chris Mason [ Upstream commit 9808eb7656666acc7291bae9ab6b987bd16e47e0 ] A peer can send a Write or Reply chunk whose segcount field is zero. xdr_check_write_chunk() only rejects segcount > rc_maxpages, so zero passes the range check, and xdr_inline_decode(stream, 0) returns the current (non-NULL) cursor without advancing. The function returns true and pcl_alloc_write() then links a struct svc_rdma_chunk with ch_segcount == 0 onto rc_write_pcl or rc_reply_pcl. An earlier patch in this series made pcl_for_each_segment() safe for ch_segcount == 0, so this no longer drives the memory walk it used to. Rejecting the malformed frame at the decode boundary is still worthwhile as defense in depth: it keeps degenerate zero-segment chunks off the parsed chunk lists entirely, so any future consumer that walks ch_segments directly cannot observe one, and it makes the zero-floor easy to backport to trees where the macro change is more intrusive. RFC 8166 has no meaning for a Write/Reply chunk that describes no remote buffer, so no legitimate client is affected. xdr_check_reply_chunk() funnels Reply chunks through xdr_check_write_chunk() and inherits the same rejection. pcl_alloc_write() also links each chunk onto the parsed chunk list before filling its segment array. If a future change weakens the segcount-0 rejection, an incomplete chunk is visible to consumers during the fill loop. Reorder so that list_add_tail() follows the segment fill loop, ensuring only fully-populated chunks appear on the list. Fixes: 78147ca8b4a9 ("svcrdma: Add a "parsed chunk list" data structure") Cc: stable@vger.kernel.org Assisted-by: kres (claude-opus-4-7) Signed-off-by: Chris Mason Acked-by: Jeff Layton Link: https://patch.msgid.link/20260526-rpc-kernel-bugs-v1-5-e251306ccca9@oracle.com Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- net/sunrpc/xprtrdma/svc_rdma_pcl.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_pcl.c b/net/sunrpc/xprtrdma/svc_rdma_pcl.c index b63cfeaa29234..a1c61311714da 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_pcl.c +++ b/net/sunrpc/xprtrdma/svc_rdma_pcl.c @@ -213,7 +213,6 @@ bool pcl_alloc_write(struct svc_rdma_recv_ctxt *rctxt, chunk = pcl_alloc_chunk(segcount, 0); if (!chunk) return false; - list_add_tail(&chunk->ch_list, &pcl->cl_chunks); for (j = 0; j < segcount; j++) { segment = &chunk->ch_segments[j]; @@ -225,6 +224,7 @@ bool pcl_alloc_write(struct svc_rdma_recv_ctxt *rctxt, chunk->ch_length += segment->rs_length; chunk->ch_segcount++; } + list_add_tail(&chunk->ch_list, &pcl->cl_chunks); } return true; } diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index f49bff8bf8b26..9f7e5ba5d69fd 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -489,10 +489,13 @@ static bool xdr_check_write_chunk(struct svc_rdma_recv_ctxt *rctxt) return false; /* Before trusting the segcount value enough to use it in - * a computation, perform a simple range check. This is an - * arbitrary but sensible limit (ie, not architectural). + * a computation, perform a simple range check. A zero + * segcount describes no remote buffer and is rejected so + * downstream consumers never see a degenerate ch_segcount==0 + * chunk. The upper bound is an arbitrary but sensible limit + * (ie, not architectural). */ - if (unlikely(segcount > rctxt->rc_maxpages)) + if (segcount == 0 || unlikely(segcount > rctxt->rc_maxpages)) return false; p = xdr_inline_decode(&rctxt->rc_stream, -- 2.53.0