io_uring: kill extra iovec=NULL in import_iovec()
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 20 Aug 2020 08:34:39 +0000 (11:34 +0300)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Aug 2020 11:36:19 +0000 (05:36 -0600)
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>
fs/io_uring.c

index b9ca5a5..91e2cc8 100644 (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 (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;
                }