Skip to content

Commit

Permalink
fix - ensure we don't use bootconsoles after init has been released
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Robin Getz authored and Linus Torvalds committed Aug 22, 2007
1 parent 15f6ddc commit cb00e99
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit cb00e99

Please sign in to comment.