FAILED: patch "[PATCH] svcrdma: Reject Read lists that exceed the page budget" failed to apply to 5.10-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 0ca487abb3bdf581851664b5db21f364caf57682
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026090331-coliseum-professed-92ed@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0ca487abb3bdf581851664b5db21f364caf57682 Mon Sep 17 00:00:00 2001
From: Chuck Lever <[email protected]>
Date: Tue, 26 May 2026 13:34:54 -0400
Subject: [PATCH] svcrdma: Reject Read lists that exceed the page budget
Individual Read segment lengths are validated at decode time, but nothing prevents a requester from sending multiple segments whose cumulative length exceeds the rq_pages array budget. When one segment fills the page array exactly, the runtime guard in svc_rdma_build_read_segment() is bypassed because len reaches zero. A subsequent segment then accesses the NULL sentinel slot at rq_pages[rq_maxpages], resulting in a NULL pointer dereference during DMA mapping.
Accumulate pages across all Read segments and reject the message at decode time when the total would overflow the page budget.
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +9 -3
@@ -440,11 +440,14 @@ static void svc_rdma_build_arg_xdr(struct svc_rqst *rqstp,* to the first byte past the Read list. rc_read_pcl and * rc_call_pcl cl_count fields are set to the number of * Read segments in the list. -* %false: Read list is corrupt. @rctxt's xdr_stream is left in an -* unknown state. +* %false: Read list is corrupt or exceeds the page budget. @rctxt's +* xdr_stream is left in an unknown state. */ static bool xdr_count_read_segments (struct svc_rdma_recv_ctxt *rctxt,__be32 *p) { +unsigned int maxlen = rctxt->rc_maxpages <<PAGE_SHIFT ; +unsigned int total_len =0 ; + rctxt->rc_call_pcl.cl_count =0 ; rctxt->rc_read_pcl.cl_count =0 ;while (xdr_item_is_present (p)) {
@@ -458,7 +461,10 @@ static bool xdr_count_read_segments(struct svc_rdma_recv_ctxt *rctxt, __be32 *p)xdr_decode_read_segment (p, &position, &handle, &length, &offset); -if (length > rctxt->rc_maxpages <<PAGE_SHIFT ) +if (length > maxlen) +return false; + total_len += length; +if (PAGE_ALIGN (total_len) > maxlen)return false;if (position) {if (position &3 )