diff options
| author | Robin Getz <rgetz@blackfin.uclinux.org> | 2007-08-21 23:14:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 20:23:53 -0700 |
| commit | cb00e99c0abd844b884c64c6b54aa3b7d345ebb1 (patch) | |
| tree | f258d30a49f864abdf836b5b2be4ebb43d542e96 | |
| parent | 15f6ddc7d9cf96f2ee88897c7164198ed6e45a77 (diff) | |
| download | lwn-cb00e99c0abd844b884c64c6b54aa3b7d345ebb1.tar.gz lwn-cb00e99c0abd844b884c64c6b54aa3b7d345ebb1.zip | |
fix - ensure we don't use bootconsoles after init has been released
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@blackfin.uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/printk.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 5c7c325b29cc..8451dfc31d25 100644 --- a/kernel/printk.c +++ b/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; } |