xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring: kill extra iovec=NULL in import_iovec()

Browse Source 
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>
This commit is contained in:
Pavel Begunkov
2020-08-20 11:34:39 +03:00
committed by Jens Axboe
parent f261c16861
commit 867a23eab5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/io_uring.c
View File

@@ -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 (opcode == IORING_OP_READ || opcode == IORING_OP_WRITE) {
if (req->flags & REQ_F_BUFFER_SELECT) { if (req->flags & REQ_F_BUFFER_SELECT) {
buf = io_rw_buffer_select(req, &sqe_len, needs_lock); buf = io_rw_buffer_select(req, &sqe_len, needs_lock);
if (IS_ERR(buf)) { if (IS_ERR(buf))
*iovec = NULL;
return PTR_ERR(buf); return PTR_ERR(buf);
}
req->rw.len = sqe_len; req->rw.len = sqe_len;
} }