mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
io_uring/rw: don't lose short results on io_setup_async_rw()
commit c278d9f8ac
upstream.
If a retry io_setup_async_rw() fails we lose result from the first
io_iter_do_read(), which is a problem mostly for streams/sockets.
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0e8d20cebe5fc9c96ed268463c394237daabc384.1664235732.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d2acb5cf6f
commit
70be076cdd
1 changed files with 5 additions and 3 deletions
|
@ -794,10 +794,12 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)
|
|||
iov_iter_restore(&s->iter, &s->iter_state);
|
||||
|
||||
ret2 = io_setup_async_rw(req, iovec, s, true);
|
||||
if (ret2)
|
||||
return ret2;
|
||||
|
||||
iovec = NULL;
|
||||
if (ret2) {
|
||||
ret = ret > 0 ? ret : ret2;
|
||||
goto done;
|
||||
}
|
||||
|
||||
io = req->async_data;
|
||||
s = &io->s;
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue