The patch titled
Subject: console: fix console name size mismatch
has been added to the -mm tree. Its filename is
console-fix-console-name-size-mismatch.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/console-fix-console-name-size-mismatch.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/console-fix-console-name-size-mismatch.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/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Subject: console: fix console name size mismatch
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@xxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [2.6.22+]
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/console_cmdline.h | 2 +-
kernel/printk/printk.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN kernel/printk/console_cmdline.h~console-fix-console-name-size-mismatch kernel/printk/console_cmdline.h
--- a/kernel/printk/console_cmdline.h~console-fix-console-name-size-mismatch
+++ a/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 -puN kernel/printk/printk.c~console-fix-console-name-size-mismatch kernel/printk/printk.c
--- a/kernel/printk/printk.c~console-fix-console-name-size-mismatch
+++ a/kernel/printk/printk.c
@@ -2464,6 +2464,7 @@ void register_console(struct console *ne
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 &&
_
Patches currently in -mm which might be from peter@xxxxxxxxxxxxxxxxxx are
console-fix-console-name-size-mismatch.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html