mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
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>
This commit is contained in:
parent
15f6ddc7d9
commit
cb00e99c0a
1 changed files with 6 additions and 4 deletions
|
@ -1085,11 +1085,13 @@ EXPORT_SYMBOL(unregister_console);
|
||||||
|
|
||||||
static int __init disable_boot_consoles(void)
|
static int __init disable_boot_consoles(void)
|
||||||
{
|
{
|
||||||
|
if (console_drivers != NULL) {
|
||||||
if (console_drivers->flags & CON_BOOT) {
|
if (console_drivers->flags & CON_BOOT) {
|
||||||
printk(KERN_INFO "turn off boot console %s%d\n",
|
printk(KERN_INFO "turn off boot console %s%d\n",
|
||||||
console_drivers->name, console_drivers->index);
|
console_drivers->name, console_drivers->index);
|
||||||
return unregister_console(console_drivers);
|
return unregister_console(console_drivers);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
late_initcall(disable_boot_consoles);
|
late_initcall(disable_boot_consoles);
|
||||||
|
|
Loading…
Reference in a new issue