path: root/kernel
diff options
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-11-23 21:37:44 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-24 00:08:39 (GMT)
commite9b15b54d3646108bbd3e054158b402025d3e704 (patch)
tree4e12028b9fd62fc13ad66d047f5d0052c2208e96 /kernel
parent962b564cf1ec8041e8890a3c3847e3a630a08f42 (diff)
[PATCH] Fix crash in unregister_console()
If unregister_console() is inadvertently called while no consoles are registered, it will crash trying to dereference NULL pointer. It is necessary to fix that because register_console() provides no indication that it actually registered the console passed in. In fact, it may well decide not to register it based on various things... (akpm: It'd be better to make register_console() return something and fix the callers. All 106 of them...) Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index ac8a08f..5287be8 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -956,7 +956,7 @@ int unregister_console(struct console *console)
if (console_drivers == console) {
res = 0;
- } else {
+ } else if (console_drivers) {
for (a=console_drivers->next, b=console_drivers ;
a; b=a, a=b->next) {
if (a == console) {

Privacy Policy