Message ID | 20240120144411.2564-1-subramanya.swamy.linux@gmail.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [v2] iouring:added boundary value check for io_uring_group systl | expand |
On 1/20/24 7:44 AM, Subramanya Swamy wrote: > /proc/sys/kernel/io_uring_group takes gid as input > added boundary value check to accept gid in range of > 0<=gid<=4294967294 & Documentation is updated for same This should have: Fixes: 76d3ccecfa18 ("io_uring: add a sysctl to disable io_uring system-wide") > diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst > index 6584a1f9bfe3..a8b61ab3e118 100644 > --- a/Documentation/admin-guide/sysctl/kernel.rst > +++ b/Documentation/admin-guide/sysctl/kernel.rst > @@ -470,10 +470,8 @@ io_uring_group > ============== > > When io_uring_disabled is set to 1, a process must either be > -privileged (CAP_SYS_ADMIN) or be in the io_uring_group group in order > -to create an io_uring instance. If io_uring_group is set to -1 (the > -default), only processes with the CAP_SYS_ADMIN capability may create > -io_uring instances. > +privledged (CAP_SYS_ADMIN) or be in the io_uring_group group in order privileged.
Hi Jens, On 20/01/24 22:31, Jens Axboe wrote: > On 1/20/24 7:44 AM, Subramanya Swamy wrote: >> /proc/sys/kernel/io_uring_group takes gid as input >> added boundary value check to accept gid in range of >> 0<=gid<=4294967294 & Documentation is updated for same > This should have: > > Fixes: 76d3ccecfa18 ("io_uring: add a sysctl to disable io_uring system-wide") added fixes to commit msg in v3 >> diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst >> index 6584a1f9bfe3..a8b61ab3e118 100644 >> --- a/Documentation/admin-guide/sysctl/kernel.rst >> +++ b/Documentation/admin-guide/sysctl/kernel.rst >> @@ -470,10 +470,8 @@ io_uring_group >> ============== >> >> When io_uring_disabled is set to 1, a process must either be >> -privileged (CAP_SYS_ADMIN) or be in the io_uring_group group in order >> -to create an io_uring instance. If io_uring_group is set to -1 (the >> -default), only processes with the CAP_SYS_ADMIN capability may create >> -io_uring instances. >> +privledged (CAP_SYS_ADMIN) or be in the io_uring_group group in order > privileged. fixed typo in v3
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst index 6584a1f9bfe3..a8b61ab3e118 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -470,10 +470,8 @@ io_uring_group ============== When io_uring_disabled is set to 1, a process must either be -privileged (CAP_SYS_ADMIN) or be in the io_uring_group group in order -to create an io_uring instance. If io_uring_group is set to -1 (the -default), only processes with the CAP_SYS_ADMIN capability may create -io_uring instances. +privledged (CAP_SYS_ADMIN) or be in the io_uring_group group in order +to create an io_uring instance. kexec_load_disabled diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index cd9a137ad6ce..bd6cc0391efa 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -154,9 +154,11 @@ static void io_queue_sqe(struct io_kiocb *req); struct kmem_cache *req_cachep; static int __read_mostly sysctl_io_uring_disabled; -static int __read_mostly sysctl_io_uring_group = -1; +static unsigned int __read_mostly sysctl_io_uring_group; #ifdef CONFIG_SYSCTL +static unsigned int max_gid = ((gid_t) ~0U) - 1; /*4294967294 is the max guid*/ + static struct ctl_table kernel_io_uring_disabled_table[] = { { .procname = "io_uring_disabled", @@ -172,7 +174,9 @@ static struct ctl_table kernel_io_uring_disabled_table[] = { .data = &sysctl_io_uring_group, .maxlen = sizeof(gid_t), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_douintvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &max_gid, }, {}, };
/proc/sys/kernel/io_uring_group takes gid as input added boundary value check to accept gid in range of 0<=gid<=4294967294 & Documentation is updated for same Signed-off-by: Subramanya Swamy <subramanya.swamy.linux@gmail.com> --- Documentation/admin-guide/sysctl/kernel.rst | 6 ++---- io_uring/io_uring.c | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-)