]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring: add IOPOLL and reserved field checks to IORING_OP_UNLINKAT
authorJens Axboe <axboe@kernel.dk>
Wed, 23 Jun 2021 15:07:45 +0000 (09:07 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 15:00:31 +0000 (17:00 +0200)
commit 22634bc5620d29765e5199c7b230a372c7ddcda2 upstream.

We can't support IOPOLL with non-pollable request types, and we should
check for unused/reserved fields like we do for other request types.

Fixes: 14a1143b68ee ("io_uring: add support for IORING_OP_UNLINKAT")
Cc: stable@vger.kernel.org
Reported-by: Dmitry Kadashev <dkadashev@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/io_uring.c

index bdf619bf4ae611f3985c8a945fe4eb3dc2833212..58ac04cca587fe479996b24536fceb0135ee2fb4 100644 (file)
@@ -3548,6 +3548,10 @@ static int io_unlinkat_prep(struct io_kiocb *req,
        struct io_unlink *un = &req->unlink;
        const char __user *fname;
 
+       if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
+               return -EINVAL;
+       if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index)
+               return -EINVAL;
        if (unlikely(req->flags & REQ_F_FIXED_FILE))
                return -EBADF;