summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDylan Yudaken <dylany@fb.com>2022-04-12 19:30:39 +0300
committerJens Axboe <axboe@kernel.dk>2022-04-12 19:46:54 +0300
commit565c5e616e8061b40a2e1d786c418a7ac3503a8d (patch)
treea993753c83c96d7060b89267c763754e6229e0ad /fs
parent0f8da75b51ac863b9435368bd50691718cc454b0 (diff)
downloadlinux-565c5e616e8061b40a2e1d786c418a7ac3503a8d.tar.xz
io_uring: move io_uring_rsrc_update2 validation
Move validation to be more consistently straight after copy_from_user. This is already done in io_register_rsrc_update and so this removes that redundant check. Signed-off-by: Dylan Yudaken <dylany@fb.com> Link: https://lore.kernel.org/r/20220412163042.2788062-2-dylany@fb.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
-rw-r--r--fs/io_uring.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 8a931eb8a3a6..58bfa71fe3b6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -11398,8 +11398,6 @@ static int __io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type,
__u32 tmp;
int err;
- if (up->resv)
- return -EINVAL;
if (check_add_overflow(up->offset, nr_args, &tmp))
return -EOVERFLOW;
err = io_rsrc_node_switch_start(ctx);
@@ -11425,6 +11423,8 @@ static int io_register_files_update(struct io_ring_ctx *ctx, void __user *arg,
memset(&up, 0, sizeof(up));
if (copy_from_user(&up, arg, sizeof(struct io_uring_rsrc_update)))
return -EFAULT;
+ if (up.resv)
+ return -EINVAL;
return __io_register_rsrc_update(ctx, IORING_RSRC_FILE, &up, nr_args);
}