The patch titled
fix - ensure we don't use bootconsoles after init has been released
has been added to the -mm tree. Its filename is
fix-ensure-we-dont-use-bootconsoles-after-init-has-been-released.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix - ensure we don't use bootconsoles after init has been released
From: Robin Getz <rgetz@xxxxxxxxxxxxxxxxxxxx>
Gerd Hoffmann pointed out that my patch from yesterday can lead to a null
pointer dereference if the kernel is booted with no console, and no
earlyprintk defined. This fixes that issue.
Signed-off-by: Robin Getz <rgetz@xxxxxxxxxxxxxxxxxxxx>
Cc: "Gerd Hoffmann" <kraxel@xxxxxxxxxx>
Cc: "Paul Mundt" <lethal@xxxxxxxxxxxx>
Cc: Mike Frysinger <vapier.adi@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN kernel/printk.c~fix-ensure-we-dont-use-bootconsoles-after-init-has-been-released kernel/printk.c
--- a/kernel/printk.c~fix-ensure-we-dont-use-bootconsoles-after-init-has-been-released
+++ a/kernel/printk.c
@@ -1085,10 +1085,12 @@ EXPORT_SYMBOL(unregister_console);
static int __init disable_boot_consoles(void)
{
- if (console_drivers->flags & CON_BOOT) {
- printk(KERN_INFO "turn off boot console %s%d\n",
- console_drivers->name, console_drivers->index);
- return unregister_console(console_drivers);
+ if (console_drivers != NULL) {
+ if (console_drivers->flags & CON_BOOT) {
+ printk(KERN_INFO "turn off boot console %s%d\n",
+ console_drivers->name, console_drivers->index);
+ return unregister_console(console_drivers);
+ }
}
return 0;
}
_
Patches currently in -mm which might be from rgetz@xxxxxxxxxxxxxxxxxxxx are
origin.patch
fix-ensure-we-dont-use-bootconsoles-after-init-has-been-released.patch
printk-add-interfaces-for-external-access-to-the-log-buffer.patch
printk-add-interfaces-for-external-access-to-the-log-buffer-fix.patch
printk-add-interfaces-for-external-access-to-the-log-buffer-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
