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: fix unexpected link breakage
commit bf68b5b343
upstream.
req->cqe.res is set in io_read() to the amount of bytes left to be done,
which is used to figure out whether to fail a read or not. However,
io_read() may do another without returning, and we stash the previous
value into ->bytes_done but forget to update cqe.res. Then we ask a read
to do strictly less than cqe.res but expect the return to be exactly
cqe.res.
Fix the bug by updating cqe.res for retries.
Cc: stable@vger.kernel.org
Reported-and-Tested-by: Beld Zhang <beldzhang@gmail.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3a1088440c7be98e5800267af922a67da0ef9f13.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
f2772a082d
commit
d2acb5cf6f
1 changed files with 1 additions and 0 deletions
|
@ -823,6 +823,7 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)
|
|||
return -EAGAIN;
|
||||
}
|
||||
|
||||
req->cqe.res = iov_iter_count(&s->iter);
|
||||
/*
|
||||
* Now retry read with the IOCB_WAITQ parts set in the iocb. If
|
||||
* we get -EIOCBQUEUED, then we'll get a notification when the
|
||||
|
|
Loading…
Reference in a new issue