XOR/mint0x33
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proc: proc_skip_spaces() shouldn't think it is working on C strings

Browse source 
commit bce9332220bd677d83b19d21502776ad555a0e73 upstream.

proc_skip_spaces() seems to think it is working on C strings, and ends
up being just a wrapper around skip_spaces() with a really odd calling
convention.

Instead of basing it on skip_spaces(), it should have looked more like
proc_skip_char(), which really is the exact same function (except it
skips a particular character, rather than whitespace).  So use that as
inspiration, odd coding and all.

Now the calling convention actually makes sense and works for the
intended purpose.

Reported-and-tested-by: Kyle Zeng <zengyhkyle@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Linus Torvalds 2022-12-05 12:09:06 -08:00 • committed by Greg Kroah-Hartman
parent 4f4ff21bbc
commit dad6ca557f
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/sysctl.c
View file

@ -2066,13 +2066,14 @@ int proc_dostring(struct ctl_table *table, int write,
(char __user *)buffer, lenp, ppos);
}
static size_t proc_skip_spaces(char **buf)
static void proc_skip_spaces(char **buf, size_t *size)
{
size_t ret;
char *tmp = skip_spaces(*buf);
ret = tmp - *buf;
*buf = tmp;
return ret;
while (*size) {
if (!isspace(**buf))
break;
(*size)--;
(*buf)++;
}
}
static void proc_skip_char(char **buf, size_t *size, const char v)
@ -2273,7 +2274,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
bool neg;
if (write) {
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
if (!left)
break;
@ -2304,7 +2305,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
if (!write && !first && left && !err)
err = proc_put_char(&buffer, &left, '\n');
if (write && !err && left)
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
if (write) {
kfree(kbuf);
if (first)
@ -2353,7 +2354,7 @@ static int do_proc_douintvec_w(unsigned int *tbl_data,
if (IS_ERR(kbuf))
return -EINVAL;
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
if (!left) {
err = -EINVAL;
goto out_free;
@ -2373,7 +2374,7 @@ static int do_proc_douintvec_w(unsigned int *tbl_data,
}
if (!err && left)
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
out_free:
kfree(kbuf);
@ -2748,7 +2749,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
if (write) {
bool neg;
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
if (!left)
break;
@ -2781,7 +2782,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
if (!write && !first && left && !err)
err = proc_put_char(&buffer, &left, '\n');
if (write && !err)
left -= proc_skip_spaces(&p);
proc_skip_spaces(&p, &left);
if (write) {
kfree(kbuf);
if (first)