summaryrefslogtreecommitdiff
path: root/kernel/printk
diff options
context:
space:
mode:
authorShreyas Joshi <shreyas.joshi@biamp.com>2020-05-22 16:53:06 +1000
committerPetr Mladek <pmladek@suse.com>2020-05-22 10:34:34 +0200
commit48021f98130880dd74286459a1ef48b5e9bc374f (patch)
treee6a21abe07796b9f31d8638457f5e161750a0c43 /kernel/printk
parent8ece3b3eb576a78d2e67ad4c3a80a39fa6708809 (diff)
printk: handle blank console arguments passed in.
If uboot passes a blank string to console_setup then it results in a trashed memory. Ultimately, the kernel crashes during freeing up the memory. This fix checks if there is a blank parameter being passed to console_setup from uboot. In case it detects that the console parameter is blank then it doesn't setup the serial device and it gracefully exits. Link: https://lore.kernel.org/r/20200522065306.83-1-shreyas.joshi@biamp.com Signed-off-by: Shreyas Joshi <shreyas.joshi@biamp.com> Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> [pmladek@suse.com: Better format the commit message and code, remove unnecessary brackets.] Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'kernel/printk')
-rw-r--r--kernel/printk/printk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 35cc5f548860..a3990505abdf 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2200,6 +2200,9 @@ static int __init console_setup(char *str)
char *s, *options, *brl_options = NULL;
int idx;
+ if (str[0] == 0)
+ return 1;
+
if (_braille_console_setup(&str, &brl_options))
return 1;