* [PATCH 5.15] SUNRPC: Copy the deferred RPC Call from the head buffer
@ 2026-11-16 13:55 Bjoern Doebel
2026-11-17 1:03 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Bjoern Doebel @ 2026-11-16 13:55 UTC (permalink / raw)
To: stable
Cc: gregkh, cel, linux-nfs, Kimi Security Team, Yilin Zhang,
Bjoern Doebel
From: Chuck Lever <cel@kernel.org>
commit 2192a56b0686599358909c3e12e9a366f5b5d452 upstream.
svc_defer() snapshots the RPC Call for replay once a pending cache
upcall resolves. It copies the Call starting (rq_arg.len -
head[0].iov_len) bytes before head[0].iov_base, a back-up that once
covered a transport header. No transport has had one since commit
983084b2672c ("SUNRPC: Remove svc_rqst::rq_xprt_hlen"), so the two
lengths are meant to be equal.
An RPCSEC_GSS Call breaks that assumption. Unwrapping the integrity
service truncates rq_arg.len by the length of the trailing checksum,
and unwrapping the privacy service leaves rq_arg.len short by an
amount the client sets with trailing bytes after the wrap token.
Neither adjusts head[0].iov_len. Both lengths are size_t, so the
subtraction underflows and the copy starts past head[0].iov_base.
Every deferred integrity Call replays a shifted snapshot.
A deferred replay skips GSS verification, so a shifted snapshot runs
as an authenticated Call. With the privacy service the offset is
client-chosen. A forged Call placed in that window, naming another
user's GSS context handle, runs under that identity.
Copy the Call from head[0].iov_base. Refuse to defer a Call whose
length runs past the head buffer, so the copy cannot read out of
bounds.
Fixes: 260c1d1298f6 ("svc: Add transport hdr size for defer/revisit")
Cc: stable@vger.kernel.org
Reported-by: Kimi Security Team <bug-report@moonshot.ai>
Reported-by: Yilin Zhang <yilinzhang@moonshot.ai>
Link: https://patch.msgid.link/20260902133101.48914-1-cel@kernel.org
Signed-off-by: Chuck Lever <cel@kernel.org>
[doebel: 5.15 backport. In this tree the RPC Call header is parsed
with svc_getnl(), which advances rq_arg.head[0].iov_base while
rq_arg.len keeps measuring from the start of the receive buffer, so
len > head[0].iov_len for every Call at svc_defer() time and the
upstream guard and copy-from-iov_base cannot apply; keep the
skip-based snapshot that svc_deferred_recv() expects. A GSS privacy
unwrap breaks the len - iov_len invariant by resetting rq_arg.len
(gss_unwrap_kerberos_v2()); refuse to defer after a GSS
integrity/privacy unwrap (rq_auth_slack != 0) or when
len < head[0].iov_len.]
Signed-off-by: Bjoern Doebel <doebel@amazon.de>
---
net/sunrpc/svc_xprt.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 3cf53e3140a5a..d88764005c256 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -1224,6 +1224,20 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req)
} else {
size_t skip;
size_t size;
+
+ /*
+ * A GSS integrity/privacy unwrap can reset rq_arg.len so
+ * it no longer measures from the start of the receive
+ * buffer (see gss_unwrap_kerberos_v2()). In that state
+ * len - iov_len does not locate the buffer start, and a
+ * snapshot taken here would be replayed without GSS
+ * verification. Refuse to defer; the caller fails the
+ * request and the client retries.
+ */
+ if (rqstp->rq_auth_slack ||
+ rqstp->rq_arg.len < rqstp->rq_arg.head[0].iov_len)
+ return NULL;
+
/* FIXME maybe discard if size too large */
size = sizeof(struct svc_deferred_req) + rqstp->rq_arg.len;
dr = kmalloc(size, GFP_KERNEL);
--
2.50.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 1:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 13:55 [PATCH 5.15] SUNRPC: Copy the deferred RPC Call from the head buffer Bjoern Doebel
2026-11-17 1:03 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox