Commit 7ebae41b authored by Peter Hurley's avatar Peter Hurley Committed by Zefan Li

console: Fix console name size mismatch

commit 30a22c21 upstream.

commit 6ae9200f ("enlarge console.name") increased the storage
for the console name to 16 bytes, but not the corresponding
struct console_cmdline::name storage. Console names longer than
8 bytes cause read beyond end-of-string and failure to match
console; I'm not sure if there are other unexpected consequences.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[lizf: Backported to 3.4:
 - adjust filename
 - s/c->name/console_cmdline[i].name/]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent f835912a
...@@ -126,7 +126,7 @@ static struct console *exclusive_console; ...@@ -126,7 +126,7 @@ static struct console *exclusive_console;
*/ */
struct console_cmdline struct console_cmdline
{ {
char name[8]; /* Name of the driver */ char name[16]; /* Name of the driver */
int index; /* Minor dev. to use */ int index; /* Minor dev. to use */
char *options; /* Options for the driver */ char *options; /* Options for the driver */
#ifdef CONFIG_A11Y_BRAILLE_CONSOLE #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
...@@ -1498,6 +1498,7 @@ void register_console(struct console *newcon) ...@@ -1498,6 +1498,7 @@ void register_console(struct console *newcon)
*/ */
for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0];
i++) { i++) {
BUILD_BUG_ON(sizeof(console_cmdline[i].name) != sizeof(newcon->name));
if (strcmp(console_cmdline[i].name, newcon->name) != 0) if (strcmp(console_cmdline[i].name, newcon->name) != 0)
continue; continue;
if (newcon->index >= 0 && if (newcon->index >= 0 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment