diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-12-23 06:37:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-12 11:59:17 +0100 |
| commit | f9309dcaa9c0e0d0d7b1dc8d3651db460ae6117f (patch) | |
| tree | 83f1c9f57e06151004c8884729e2a4a078c22434 | |
| parent | 4df413d46960f11c8c105238cfc3f5ff4c95c003 (diff) | |
| download | linux-f9309dcaa9c0e0d0d7b1dc8d3651db460ae6117f.tar.gz linux-f9309dcaa9c0e0d0d7b1dc8d3651db460ae6117f.tar.bz2 linux-f9309dcaa9c0e0d0d7b1dc8d3651db460ae6117f.zip | |
io_uring: check for valid register opcode earlier
[ Upstream commit 343190841a1f22b96996d9f8cfab902a4d1bfd0e ]
We only check the register opcode value inside the restricted ring
section, move it into the main io_uring_register() function instead
and check it up front.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | io_uring/io_uring.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index eebbe8a6da0c..52a08632326a 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -10895,8 +10895,6 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, return -ENXIO; if (ctx->restricted) { - if (opcode >= IORING_REGISTER_LAST) - return -EINVAL; opcode = array_index_nospec(opcode, IORING_REGISTER_LAST); if (!test_bit(opcode, ctx->restrictions.register_op)) return -EACCES; @@ -11028,6 +11026,9 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode, long ret = -EBADF; struct fd f; + if (opcode >= IORING_REGISTER_LAST) + return -EINVAL; + f = fdget(fd); if (!f.file) return -EBADF; |