]> git.hungrycats.org Git - linux/commit
io_uring/net: harden multishot termination case for recv
authorJens Axboe <axboe@kernel.dk>
Thu, 26 Sep 2024 13:08:10 +0000 (07:08 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:01:06 +0000 (12:01 +0200)
commit83fde8356b410bd244f83ff3517059b34e112fb4
tree7882cdbad958428e504f9486ee61db9f2a859ef0
parent540138377b22f601f06f55ebfa3ca171dcab471a
io_uring/net: harden multishot termination case for recv

commit c314094cb4cfa6fc5a17f4881ead2dfebfa717a7 upstream.

If the recv returns zero, or an error, then it doesn't matter if more
data has already been received for this buffer. A condition like that
should terminate the multishot receive. Rather than pass in the
collected return value, pass in whether to terminate or keep the recv
going separately.

Note that this isn't a bug right now, as the only way to get there is
via setting MSG_WAITALL with multishot receive. And if an application
does that, then -EINVAL is returned anyway. But it seems like an easy
bug to introduce, so let's make it a bit more explicit.

Link: https://github.com/axboe/liburing/issues/1246
Cc: stable@vger.kernel.org
Fixes: b3fdea6ecb55 ("io_uring: multishot recv")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/net.c