io_uring: handle -EFAULT properly in io_uring_setup()
PATCH v2 1/1 io_uring: handle -EFAULT properly in io_uring_setup()
If copy_to_user() in io_uring_setup() failed, we'll leak many kernel resources, which will be recycled until process terminates. This bug can be reproduced by using mprotect to set params to PROT_READ. To fix this issue, refactor io_uring_create() a bit to add a new 'struct io_uring_params __user *params' parameter and move the copy_to_user() in io_uring_setup() to io_uring_setup(), if copy_to_user() failed, we can free kernel resource properly.
--- fs/io_uring.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
fs/io_uring.c +11 -13
@@ -7761,7 +7761,8 @@ static int io_uring_get_fd(struct io_ring_ctx *ctx)return ret; } -static int io_uring_create (unsigned entries,struct io_uring_params *p) +static int io_uring_create (unsigned entries,struct io_uring_params *p, +struct io_uring_params __user *params) {struct user_struct *user =NULL ;struct io_ring_ctx *ctx;
@@ -7853,6 +7854,14 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p) p->cq_off.overflow = offsetof(struct io_rings , cq_overflow); p->cq_off.cqes = offsetof(struct io_rings , cqes); + p->features =IORING_FEAT_SINGLE_MMAP |IORING_FEAT_NODROP | +IORING_FEAT_SUBMIT_STABLE |IORING_FEAT_RW_CUR_POS | +IORING_FEAT_CUR_PERSONALITY |IORING_FEAT_FAST_POLL ; + +if (copy_to_user (params, p,sizeof (*p))) { + ret = -EFAULT ; + goto err; + }/* * Install ring fd as the very last thing, so we don't risk someone * having closed it before we finish setup
@@ -7861,9 +7870,6 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p)if (ret <0 ) goto err; - p->features =IORING_FEAT_SINGLE_MMAP |IORING_FEAT_NODROP | -IORING_FEAT_SUBMIT_STABLE |IORING_FEAT_RW_CUR_POS | -IORING_FEAT_CUR_PERSONALITY |IORING_FEAT_FAST_POLL ;trace_io_uring_create (ret, ctx, p->sq_entries, p->cq_entries, p->flags);return ret; err:
@@ -7879,7 +7885,6 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p)static long io_uring_setup (u32 entries,struct io_uring_params __user *params) {struct io_uring_params p; -long ret;int i;if (copy_from_user (&p, params,sizeof (p)))
@@ -7894,14 +7899,7 @@ static long io_uring_setup(u32 entries, struct io_uring_params __user *params) IORING_SETUP_CLAMP | IORING_SETUP_ATTACH_WQ)) return -EINVAL; - ret =io_uring_create (entries, &p); -if (ret <0 ) -return ret; - -if (copy_to_user (params, &p,sizeof (p))) -return -EFAULT ; - -return ret; +return io_uring_create (entries, &p, params); } SYSCALL_DEFINE2(io_uring_setup, u32, entries,
Signature · 1 line
2.17.2
Quoted 7 lines · Xiaoguang Wang
If
copy_to_user()inio_uring_setup()failed, we'll leak many kernel resources, which will be recycled until process terminates. This bug can be reproduced by using mprotect to set params toPROT_READ. To fix this issue, refactorio_uring_create()a bit to add a new 'structio_uring_params__user*params' parameter and move thecopy_to_user()inio_uring_setup()toio_uring_setup(), ifcopy_to_user()failed, we can free kernel resource properly.
Applied, thanks!
Signature · 1 line
Jens Axboe