From: Pavel Begunkov <asml.silence@gmail.com>
Date: Mon, 26 Sep 2022 23:44:40 +0000 (+0100)
Subject: io_uring/rw: don't lose short results on io_setup_async_rw()
X-Git-Tag: v6.0.3~838
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70be076cddc2bc5f2442be8f92840cd76e359205;p=thirdparty%2Fkernel%2Fstable.git

io_uring/rw: don't lose short results on io_setup_async_rw()

commit c278d9f8ac0db5590909e6d9e85b5ca2b786704f 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>
---

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 0a269d47185b1..295e3456d68ea 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -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;
 	/*