* + proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch added to -mm tree
@ 2021-01-09 1:51 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2021-01-09 1:51 UTC (permalink / raw)
To: adobriyan, keescook, mcgrof, mhocko, mm-commits, nixiaoming,
vbabka, yzaikin
The patch titled
Subject: proc_sysctl: fix oops caused by incorrect command parameters.
has been added to the -mm tree. Its filename is
proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Xiaoming Ni <nixiaoming@huawei.com>
Subject: proc_sysctl: fix oops caused by incorrect command parameters.
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".
log:
Kernel command line: .... hung_task_panic
....
[000000000000000n] user address but active_mm is swapper
Internal error: Oops: 96000005 [#1] SMP
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.10.1 #1
Hardware name: linux,dummy-virt (DT)
pstate: 40000005 (nZcv daif -PAN -UAO -TCO BTYPE=--)
pc : __pi_strlen+0x10/0x98
lr : process_sysctl_arg+0x1e4/0x2ac
sp : ffffffc01104bd40
x29: ffffffc01104bd40 x28: 0000000000000000
x27: ffffff80c0a4691e x26: ffffffc0102a7c8c
x25: 0000000000000000 x24: ffffffc01104be80
x23: ffffff80c22f0b00 x22: ffffff80c02e28c0
x21: ffffffc0109f9000 x20: 0000000000000000
x19: ffffffc0107c08de x18: 0000000000000003
x17: ffffffc01105d000 x16: 0000000000000054
x15: ffffffffffffffff x14: 3030253078413830
x13: 000000000000ffff x12: 0000000000000000
x11: 0101010101010101 x10: 0000000000000005
x9 : 0000000000000003 x8 : ffffff80c0980c08
x7 : 0000000000000000 x6 : 0000000000000002
x5 : ffffff80c0235000 x4 : ffffff810f7c7ee0
x3 : 000000000000043a x2 : 00bdcc4ebacf1a54
x1 : 0000000000000000 x0 : 0000000000000000
Call trace:
__pi_strlen+0x10/0x98
parse_args+0x278/0x344
do_sysctl_args+0x8c/0xfc
kernel_init+0x5c/0xf4
ret_from_fork+0x10/0x30
Code: b200c3eb 927cec01 f2400c07 54000301 (a8c10c22)
Link: https://lkml.kernel.org/r/20210108023339.55917-1-nixiaoming@huawei.com
Fixes: 3db978d480e2843 ("kernel/sysctl: support setting sysctl parameters from kernel command line")
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
Cc: Michal Hocko <mhocko@suse.com>
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: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/proc/proc_sysctl.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/fs/proc/proc_sysctl.c~proc_sysctl-fix-oops-caused-by-incorrect-command-parameters
+++ a/fs/proc/proc_sysctl.c
@@ -1757,6 +1757,11 @@ static int process_sysctl_arg(char *para
loff_t pos = 0;
ssize_t wret;
+ if (!val) {
+ pr_err("Missing param value! Expected '%s=...value...'\n", param);
+ return 0;
+ }
+
if (strncmp(param, "sysctl", sizeof("sysctl") - 1) == 0) {
param += sizeof("sysctl") - 1;
_
Patches currently in -mm which might be from nixiaoming@huawei.com are
proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* + proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch added to -mm tree
@ 2021-01-19 20:02 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2021-01-19 20:02 UTC (permalink / raw)
To: adobriyan, hkallweit1, keescook, mcgrof, mhiramat, mhocko,
mm-commits, nixiaoming, rdunlap, stable, vbabka, yzaikin
The patch titled
Subject: proc_sysctl: fix oops caused by incorrect command parameters
has been added to the -mm tree. Its filename is
proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Xiaoming Ni <nixiaoming@huawei.com>
Subject: proc_sysctl: fix oops caused by incorrect command parameters
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: 3db978d480e2843 ("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>
---
fs/proc/proc_sysctl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/fs/proc/proc_sysctl.c~proc_sysctl-fix-oops-caused-by-incorrect-command-parameters
+++ a/fs/proc/proc_sysctl.c
@@ -1770,6 +1770,12 @@ static int process_sysctl_arg(char *para
return 0;
}
+ if (!val)
+ return -EINVAL;
+ len = strlen(val);
+ if (len == 0)
+ return -EINVAL;
+
/*
* To set sysctl options, we use a temporary mount of proc, look up the
* respective sys/ file and write to it. To avoid mounting it when no
@@ -1811,7 +1817,6 @@ static int process_sysctl_arg(char *para
file, param, val);
goto out;
}
- len = strlen(val);
wret = kernel_write(file, val, len, &pos);
if (wret < 0) {
err = wret;
_
Patches currently in -mm which might be from nixiaoming@huawei.com are
proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-19 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-09 1:51 + proc_sysctl-fix-oops-caused-by-incorrect-command-parameters.patch added to -mm tree akpm
2021-01-19 20:02 akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).