diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-03-08 01:48:03 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-03-08 01:48:03 +0100 |
| commit | deaef31bc1ec7966698a427da8c161930830e1cf (patch) | |
| tree | 9b5c0c57d8dac2dc7bc87afe26cf915ebba04971 /io_uring | |
| parent | io_uring/net: clear REQ_F_BL_EMPTY in the multishot retry handler (diff) | |
| download | linux-deaef31bc1ec7966698a427da8c161930830e1cf.tar.xz linux-deaef31bc1ec7966698a427da8c161930830e1cf.zip | |
io_uring/net: correctly handle multishot recvmsg retry setup
If we loop for multishot receive on the initial attempt, and then abort
later on to wait for more, we miss a case where we should be copying the
io_async_msghdr from the stack to stable storage. This leads to the next
retry potentially failing, if the application had the msghdr on the
stack.
Cc: stable@vger.kernel.org
Fixes: 9bb66906f23e ("io_uring: support multishot in recvmsg")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index e50947e7cd57..52f0d3b735fd 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -931,7 +931,8 @@ retry_multishot: kfree(kmsg->free_iov); io_netmsg_recycle(req, issue_flags); req->flags &= ~REQ_F_NEED_CLEANUP; - } + } else if (ret == -EAGAIN) + return io_setup_async_msg(req, kmsg, issue_flags); return ret; } |