2007-02-03 02:36:16

by Chris Wright

[permalink] [raw]
Subject: [patch 16/59] start_kernel: test if irqs got enabled early, barf, and disable them again

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Ard van Breemen <[email protected]>

The calls made by parse_parms to other initialization code might enable
interrupts again way too early.

Having interrupts on this early can make systems PANIC when they initialize
the IRQ controllers (which happens later in the code). This patch detects
that irq's are enabled again, barfs about it and disables them again as a
safety net.

[[email protected]: cleanups]
Signed-off-by: Ard van Breemen <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
This is half of the fix for http://bugzilla.kernel.org/show_bug.cgi?id=7505

init/main.c | 5 +++++
1 file changed, 5 insertions(+)

--- linux-2.6.19.2.orig/init/main.c
+++ linux-2.6.19.2/init/main.c
@@ -525,6 +525,11 @@ asmlinkage void __init start_kernel(void
parse_args("Booting kernel", command_line, __start___param,
__stop___param - __start___param,
&unknown_bootoption);
+ if (!irqs_disabled()) {
+ printk(KERN_WARNING "start_kernel(): bug: interrupts were "
+ "enabled *very* early, fixing it\n");
+ local_irq_disable();
+ }
sort_main_extable();
trap_init();
rcu_init();

--