diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-08-20 10:34:39 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-08-20 13:36:19 +0200 |
| commit | 867a23eab52847d41a0a6eae41a64d76de7782a8 (patch) | |
| tree | 48d204ce4cf3ac11de1ca386d11105cb0a3e9355 /fs | |
| parent | io_uring: comment on kfree(iovec) checks (diff) | |
| download | linux-867a23eab52847d41a0a6eae41a64d76de7782a8.tar.xz linux-867a23eab52847d41a0a6eae41a64d76de7782a8.zip | |
io_uring: kill extra iovec=NULL in import_iovec()
If io_import_iovec() returns an error, return iovec is undefined and
must not be used, so don't set it to NULL when failing.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index b9ca5a54dc20..91e2cc8414f9 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2826,10 +2826,8 @@ static ssize_t __io_import_iovec(int rw, struct io_kiocb *req, if (opcode == IORING_OP_READ || opcode == IORING_OP_WRITE) { if (req->flags & REQ_F_BUFFER_SELECT) { buf = io_rw_buffer_select(req, &sqe_len, needs_lock); - if (IS_ERR(buf)) { - *iovec = NULL; + if (IS_ERR(buf)) return PTR_ERR(buf); - } req->rw.len = sqe_len; } |