fix - ensure we don't use bootconsoles after init has been released

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cb00e99c0abd844b884c64c6b54aa3b7d345ebb1
Commit: cb00e99c0abd844b884c64c6b54aa3b7d345ebb1
Parent: 15f6ddc7d9cf96f2ee88897c7164198ed6e45a77
Author: Robin Getz [EMAIL PROTECTED]
AuthorDate: Tue Aug 21 23:14:58 2007 -0400
Committer:  Linus Torvalds [EMAIL PROTECTED]
CommitDate: Tue Aug 21 20:23:53 2007 -0700

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 [EMAIL PROTECTED]
Signed-off-by: Linus Torvalds [EMAIL PROTECTED]
---
 kernel/printk.c |   10 ++
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/printk.c b/kernel/printk.c
index 5c7c325..8451dfc 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;
 }
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ensure we don't use bootconsoles after init has been released

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0c5564bd91ad237212871d52deaf79ffe06bcc64
Commit: 0c5564bd91ad237212871d52deaf79ffe06bcc64
Parent: 35b426c329e12e33bd0f0912f3d2e3f5f7b2c486
Author: Robin Getz [EMAIL PROTECTED]
AuthorDate: Mon Aug 20 15:22:47 2007 -0400
Committer:  Linus Torvalds [EMAIL PROTECTED]
CommitDate: Mon Aug 20 22:42:01 2007 -0700

ensure we don't use bootconsoles after init has been released

This is a followup to the cleanups for earlyprintk patch from Gerd Hoffmann


http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69331af79cf29e26d1231152a172a1a10c2df511

This ensures that a bootconsole is unregistered if it is not replaced.
The current implementation spews garbage out the bootconsole in this case,
since the bootconsole structure is normally in the init section, and is
freed, but still used.

Signed-off-by: Robin Getz [EMAIL PROTECTED]
Acked-by: Gerd Hoffmann [EMAIL PROTECTED]
Acked-by: Paul Mundt [EMAIL PROTECTED]
Cc: Mike Frysinger [EMAIL PROTECTED]
Signed-off-by: Linus Torvalds [EMAIL PROTECTED]
---
 kernel/printk.c |   11 +++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/kernel/printk.c b/kernel/printk.c
index bd2cd06..5c7c325 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1083,6 +1083,17 @@ int unregister_console(struct console *console)
 }
 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);
+   }
+   return 0;
+}
+late_initcall(disable_boot_consoles);
+
 /**
  * tty_write_message - write a message to a certain tty, not just the console.
  * @tty: the destination tty_struct
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html