]> www.infradead.org Git - users/jedix/linux-maple.git/commit
io_uring/zcrx: return early from io_zcrx_recv_skb if readlen is 0
authorDavid Wei <dw@davidwei.uk>
Tue, 1 Apr 2025 19:53:55 +0000 (12:53 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 1 Apr 2025 20:00:46 +0000 (14:00 -0600)
commitfcfd94d6967a98e88b834c9fd81e73c5f04d83dc
tree2d06c0b20fc2b056647a7af8f5eb8a31046f8ce5
parent81ed18015d65f111ddbc88599c48338a5e1927d0
io_uring/zcrx: return early from io_zcrx_recv_skb if readlen is 0

When readlen is set for a recvzc request, tcp_read_sock() will call
io_zcrx_recv_skb() one final time with len == desc->count == 0. This is
caused by the !desc->count check happening too late. The offset + 1 !=
skb->len happens earlier and causes the while loop to continue.

Fix this in io_zcrx_recv_skb() instead of tcp_read_sock(). Return early
if len is 0 i.e. the read is done.

Fixes: 6699ec9a23f8 ("io_uring/zcrx: add a read limit to recvzc requests")
Signed-off-by: David Wei <dw@davidwei.uk>
Link: https://lore.kernel.org/r/20250401195355.1613813-1-dw@davidwei.uk
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/zcrx.c