Commit 5e929367 authored by Jens Axboe's avatar Jens Axboe

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

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: default avatarJoel Jaeschke <joel.jaeschke@gmail.com>
Link: https://github.com/axboe/liburing/issues/549
Fixes: 16c8d2df ("io_uring: ensure symmetry in handling iter types in loop_rw_iter()")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent adf3a9e9
...@@ -3612,13 +3612,15 @@ static ssize_t loop_rw_iter(int rw, struct io_kiocb *req, struct iov_iter *iter) ...@@ -3612,13 +3612,15 @@ static ssize_t loop_rw_iter(int rw, struct io_kiocb *req, struct iov_iter *iter)
ret = nr; ret = nr;
break; break;
} }
ret += nr;
if (!iov_iter_is_bvec(iter)) { if (!iov_iter_is_bvec(iter)) {
iov_iter_advance(iter, nr); iov_iter_advance(iter, nr);
} else { } else {
req->rw.len -= nr;
req->rw.addr += nr; req->rw.addr += nr;
req->rw.len -= nr;
if (!req->rw.len)
break;
} }
ret += nr;
if (nr != iovec.iov_len) if (nr != iovec.iov_len)
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment