projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb981d5
)
io_uring: move io_uring_rsrc_update2 validation
author
Dylan Yudaken
<dylany@fb.com>
Tue, 12 Apr 2022 16:30:39 +0000
(09:30 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 20 Apr 2022 07:34:12 +0000
(09:34 +0200)
[ Upstream commit
565c5e616e8061b40a2e1d786c418a7ac3503a8d
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index
3d44d48
..
0568304
100644
(file)
--- a/
fs/io_uring.c
+++ b/
fs/io_uring.c
@@
-10595,8
+10595,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);
@@
-10622,6
+10620,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);
}