diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-21 08:49:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:35:45 -0800 |
| commit | c239b77ea4d6771e65476e31231b87d0b22fde0c (patch) | |
| tree | 8aa2966cc08247ca874c0ea7d5eceaf99e81e0a2 /io_uring | |
| parent | 2c487fbf22303cf6f21e59659bccc0ce0ff0ca41 (diff) | |
| download | linux-stable-c239b77ea4d6771e65476e31231b87d0b22fde0c.tar.gz linux-stable-c239b77ea4d6771e65476e31231b87d0b22fde0c.tar.bz2 linux-stable-c239b77ea4d6771e65476e31231b87d0b22fde0c.zip | |
io_uring/rw: ensure io->bytes_done is always initialized
commit 0a535eddbe0dc1de4386046ab849f08aeb2f8faf upstream.
If IOSQE_ASYNC is set and we fail importing an iovec for a readv or
writev request, then we leave ->bytes_done uninitialized and hence the
eventual failure CQE posted can potentially have a random res value
rather than the expected -EINVAL.
Setup ->bytes_done before potentially failing, so we have a consistent
value if we fail the request early.
Cc: stable@vger.kernel.org
Reported-by: xingwei lee <xrivendell7@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/rw.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index 8f68d5ad4564..0a0c1c9db0f9 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -549,15 +549,19 @@ static inline int io_rw_prep_async(struct io_kiocb *req, int rw) struct iovec *iov; int ret; + iorw->bytes_done = 0; + iorw->free_iovec = NULL; + /* submission path, ->uring_lock should already be taken */ ret = io_import_iovec(rw, req, &iov, &iorw->s, 0); if (unlikely(ret < 0)) return ret; - iorw->bytes_done = 0; - iorw->free_iovec = iov; - if (iov) + if (iov) { + iorw->free_iovec = iov; req->flags |= REQ_F_NEED_CLEANUP; + } + return 0; } |