io_uring: terminate manual loop iterator loop correctly for non-vecs

5e929367 · Jens Axboe <[email protected]> · 2022-03-18 11:28:13 -06:00

The fix for not advancing the iterator if we're using fixed buffers is
broken in that it can hit a condition where we don't terminate the loop.
This results in io-wq looping forever, asking to read (or write) 0 bytes
for every subsequent loop.

Reported-by: Joel Jaeschke <[email protected]>
Link: https://github.com/axboe/liburing/issues/549
Fixes: 16c8d2df7ec0 ("io_uring: ensure symmetry in handling iter types in loop_rw_iter()")
Signed-off-by: Jens Axboe <[email protected]>

Commit: 5e929367468c8f97cd1ffb0417316cecfebef94b
Parents: adf3a9e9

Changes

1 files changed · +4 −2

File	Status	Add	Del	Content
fs/io_uring.c	modified	+4	−2	View file

fs/io_uring.c

View file

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2d6ab73..5fa7363 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3612,13 +3612,15 @@ static ssize_t loop_rw_iter(int rw, struct io_kiocb *req, struct iov_iter *iter)
 				ret = nr;
 			break;
 		}
+		ret += nr;
 		if (!iov_iter_is_bvec(iter)) {
 			iov_iter_advance(iter, nr);
 		} else {
-			req->rw.len -= nr;
 			req->rw.addr += nr;
+			req->rw.len -= nr;
+			if (!req->rw.len)
+				break;
 		}
-		ret += nr;
 		if (nr != iovec.iov_len)
 			break;
 	}