Skip to content

Commit cb5fe25

Browse files
nixiaominggregkh
authored andcommitted
proc_sysctl: fix oops caused by incorrect command parameters
commit 697edcb upstream. The process_sysctl_arg() does not check whether val is empty before invoking strlen(val). If the command line parameter () is incorrectly configured and val is empty, oops is triggered. For example: "hung_task_panic=1" is incorrectly written as "hung_task_panic", oops is triggered. The call stack is as follows: Kernel command line: .... hung_task_panic ...... Call trace: __pi_strlen+0x10/0x98 parse_args+0x278/0x344 do_sysctl_args+0x8c/0xfc kernel_init+0x5c/0xf4 ret_from_fork+0x10/0x30 To fix it, check whether "val" is empty when "phram" is a sysctl field. Error codes are returned in the failure branch, and error logs are generated by parse_args(). Link: https://lkml.kernel.org/r/20210118133029.28580-1-nixiaoming@huawei.com Fixes: 3db978d ("kernel/sysctl: support setting sysctl parameters from kernel command line") Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Iurii Zaikin <yzaikin@google.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Heiner Kallweit <hkallweit1@gmail.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: <stable@vger.kernel.org> [5.8+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c351dc4 commit cb5fe25

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/proc/proc_sysctl.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,6 +1770,12 @@ static int process_sysctl_arg(char *param, char *val,
17701770
return 0;
17711771
}
17721772

1773+
if (!val)
1774+
return -EINVAL;
1775+
len = strlen(val);
1776+
if (len == 0)
1777+
return -EINVAL;
1778+
17731779
/*
17741780
* To set sysctl options, we use a temporary mount of proc, look up the
17751781
* respective sys/ file and write to it. To avoid mounting it when no
@@ -1811,7 +1817,6 @@ static int process_sysctl_arg(char *param, char *val,
18111817
file, param, val);
18121818
goto out;
18131819
}
1814-
len = strlen(val);
18151820
wret = kernel_write(file, val, len, &pos);
18161821
if (wret < 0) {
18171822
err = wret;

0 commit comments

Comments
 (0)