diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2025-10-08 13:38:06 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-10-08 07:26:08 -0600 |
| commit | 09cfd3c52ea76f43b3cb15e570aeddf633d65e80 (patch) | |
| tree | 1b88c8144d720d4c351e690a3b2d15ba72c3ae91 /io_uring | |
| parent | beb97995b97532e1f215e3295e6843e59862f94b (diff) | |
io_uring/zcrx: fix overshooting recv limit
It's reported that sometimes a zcrx request can receive more than was
requested. It's caused by io_zcrx_recv_skb() adjusting desc->count for
all received buffers including frag lists, but then doing recursive
calls to process frag list skbs, which leads to desc->count double
accounting and underflow.
Reported-and-tested-by: Matthias Jasny <matthiasjasny@gmail.com>
Fixes: 6699ec9a23f85 ("io_uring/zcrx: add a read limit to recvzc requests")
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/zcrx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 723e4266b91f..ef73440b605a 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -1236,12 +1236,16 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, end = start + frag_iter->len; if (offset < end) { + size_t count; + copy = end - offset; if (copy > len) copy = len; off = offset - start; + count = desc->count; ret = io_zcrx_recv_skb(desc, frag_iter, off, copy); + desc->count = count; if (ret < 0) goto out; |