diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-03-01 10:11:05 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-18 15:07:22 +0000 |
| commit | 11f41b27f9a902ec0a5ebc0bf4ce506341bb830c (patch) | |
| tree | 4d25e8334add00eb0682a2a962af787d9dcbddb3 | |
| parent | c468bf26c02d9aa8e3264bc00af07c34306a5c7b (diff) | |
| download | linux-stable-11f41b27f9a902ec0a5ebc0bf4ce506341bb830c.tar.gz linux-stable-11f41b27f9a902ec0a5ebc0bf4ce506341bb830c.tar.bz2 linux-stable-11f41b27f9a902ec0a5ebc0bf4ce506341bb830c.zip | |
console: Fix console name size mismatch
commit 30a22c215a0007603ffc08021f2e8b64018517dd upstream.
commit 6ae9200f2cab7 ("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: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | kernel/printk/console_cmdline.h | 2 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk/console_cmdline.h b/kernel/printk/console_cmdline.h index cbd69d842341..2ca4a8b5fe57 100644 --- a/kernel/printk/console_cmdline.h +++ b/kernel/printk/console_cmdline.h @@ -3,7 +3,7 @@ struct console_cmdline { - char name[8]; /* Name of the driver */ + char name[16]; /* Name of the driver */ int index; /* Minor dev. to use */ char *options; /* Options for the driver */ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 971285d5b7a0..cce20d2f38d5 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2388,6 +2388,7 @@ void register_console(struct console *newcon) for (i = 0, c = console_cmdline; i < MAX_CMDLINECONSOLES && c->name[0]; i++, c++) { + BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name)); if (strcmp(c->name, newcon->name) != 0) continue; if (newcon->index >= 0 && |