diff options
| author | Shreyas Joshi <shreyas.joshi@biamp.com> | 2020-05-22 16:53:06 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 11:11:56 +0200 |
| commit | dbb537734d9210c61550baa40f81a08a2c14b245 (patch) | |
| tree | 1e1914ee4307413607d87a44cc3b6c09fe979721 /kernel | |
| parent | 233addb01f18b0d8374661e051f8079cfc458567 (diff) | |
| download | linux-stable-dbb537734d9210c61550baa40f81a08a2c14b245.tar.gz linux-stable-dbb537734d9210c61550baa40f81a08a2c14b245.tar.bz2 linux-stable-dbb537734d9210c61550baa40f81a08a2c14b245.zip | |
printk: handle blank console arguments passed in.
[ Upstream commit 48021f98130880dd74286459a1ef48b5e9bc374f ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e53a976ca28e..b55dfb3e801f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2032,6 +2032,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; |