sysctl: move the extra1/2 boundary check of u8 to sysctl_check_table_array
Subsystems (2)
PATCH v4 1/1 sysctl: move the extra1/2 boundary check of u8 to sysctl_check_table_array
Move boundary checking for proc_dou8ved_minmax into module loading, thereby reporting errors in advance. And add a kunit test case ensuring the boundary check is done correctly.
The boundary check in proc_dou8vec_minmax done to the extra elements in the ctl_table struct is currently performed at runtime. This allows buggy kernel modules to be loaded normally without any errors only to fail when used.
This is a buggy example module:
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sysctl.h>
static struct ctl_table_header *_table_header = NULL;
static unsigned char _data = 0;
struct ctl_table table[] = {
{
.procname = "foo",
.data = &_data,
.maxlen = sizeof(u8),
.mode = 0644,
.proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE_THOUSAND,
},
};
static int init_demo(void) {
_table_header = register_sysctl("kernel", table);
if (!_table_header)
return -ENOMEM;
return 0;
}
module_init(init_demo);
MODULE_LICENSE("GPL");And this is the result:
# insmod test.ko
# cat /proc/sys/kernel/foo
cat: /proc/sys/kernel/foo: Invalid argument---
v4:
- commit log: move the text describing what was done to the top.
- commit log: rework the buggy example module
- proc_sysctl.c: print error messages that can indicate this specific issue
- sysctl.c: leave as (unsigned int *)
v3:
- kunit: using register_sysctl, and thus unnecessary sentries were removed
- kunit: using constant ctl_tables
v2:
- kunit: detect registration failure with KUNIT_EXPECT_NULL
fs/proc/proc_sysctl.c | 14 +++++++++++++ kernel/sysctl-test.c | 49 +++++++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 10 ++------- 3 files changed, 65 insertions(+), 8 deletions(-)
fs/proc/proc_sysctl.c +14 -0
@@ -1093,6 +1093,7 @@ static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...)static int sysctl_check_table_array (const char *path,struct ctl_table *table) { +unsigned int extra;int err =0 ; if ((table->proc_handler == proc_douintvec) ||
@@ -1104,6 +1105,19 @@ static int sysctl_check_table_array(const char *path, struct ctl_table *table)if (table->proc_handler == proc_dou8vec_minmax) {if (table->maxlen !=sizeof (u8)) err |=sysctl_err (path, table,"array not allowed" ); + +if (table->extra1) { + extra = *(unsigned int *) table->extra1; +if (extra >255U ) + err |=sysctl_err (path, table, +"range value too large for proc_dou8vec_minmax" ); + } +if (table->extra2) { + extra = *(unsigned int *) table->extra2; +if (extra >255U ) + err |=sysctl_err (path, table, +"range value too large for proc_dou8vec_minmax" ); + } }if (table->proc_handler == proc_dobool) {
kernel/sysctl-test.c +49 -0
61 lines not on this page · raw message
kernel/sysctl.c +2 -8
@@ -977,16 +977,10 @@ int proc_dou8vec_minmax(struct ctl_table *table, int write,if (table->maxlen !=sizeof (u8))return -EINVAL ; -if (table->extra1) { +if (table->extra1) min = *(unsigned int *) table->extra1; -if (min >255U ) -return -EINVAL ; - } -if (table->extra2) { +if (table->extra2) max = *(unsigned int *) table->extra2; -if (max >255U ) -return -EINVAL ; - } tmp = *table;
Signature · 1 line
2.25.1
Quoted 4 lines · Wen Yang
Move boundary checking for
proc_dou8ved_minmaxinto module loading, thereby reporting errors in advance. And add a kunit test case ensuring the boundary check is done correctly.
...
Quoted 30 lines
kernel/sysctl-test.c +1
-0+ KUNIT_CASE(sysctl_test_register_sysctl_sz_invalid_extra_value), {} };kernel/sysctl.c +2
-8@@ -977,16 +977,10 @@ int proc_dou8vec_minmax(struct ctl_table *table, int write,if (table->maxlen !=sizeof (u8))return -EINVAL ; -if (table->extra1) { +if (table->extra1) min = *(unsigned int *) table->extra1; -if (min >255U ) -return -EINVAL ; - } -if (table->extra2) { +if (table->extra2) max = *(unsigned int *) table->extra2; -if (max >255U ) -return -EINVAL ; - } tmp = *table;Signature · 1 line
2.25.1
Queueing this up for 6.11. I'll put it into sysclt-testing.
Signature · 1 line
Joel Granados