lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] arch: x86: take precautions against spurious timer interrupts
Date
If hpet is enabled by hpet_late_init() - this usually occurs on systems
with buggy BIOS, which does not report about hpet presence through ACPI,
hpet_clockevent's event_handler can be left uninitialized by
clockevents_register_device() because of hpet_clockevent low rating (by
the time hpet_late_init() is called, high prio apic timers have already
been setup). The event_handler is then initialized a bit later by the
clocksource_done_booting() procedure.

Normally, timer interrupts should not be delivered between these two
calls, but if e.g. the kernel is booted using kexec, there might be some
pending interrupts from the previous kernel's context, which can lead to
a NULL pointer dereference.

So, take precautions against spurious timer interrupts by checking the
event_handler value before calling it.
---
arch/x86/kernel/time.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index c6eba2b..43bdd3a 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -57,7 +57,23 @@ EXPORT_SYMBOL(profile_pc);
*/
static irqreturn_t timer_interrupt(int irq, void *dev_id)
{
- global_clock_event->event_handler(global_clock_event);
+ /*
+ * If hpet is enabled by hpet_late_init(), event_handler can be left
+ * uninitialized by clockevents_register_device() because of
+ * hpet_clockevent low rating (by the time hpet_late_init() is called,
+ * high prio apic timers have already been setup). The event_handler is
+ * then initialized a bit later by the clocksource_done_booting()
+ * procedure.
+ *
+ * Normally, timer interrupts should not be delivered between these two
+ * calls, but if e.g. the kernel is booted using kexec, there might be
+ * some pending interrupts from the previous kernel's context, which
+ * can lead to a NULL pointer dereference.
+ *
+ * So, take precautions against spurious timer interrupts.
+ */
+ if (global_clock_event->event_handler)
+ global_clock_event->event_handler(global_clock_event);

/* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
if (MCA_bus)
--
1.7.1


\
 
 \ /
  Last update: 2012-04-23 14:21    [W:0.033 / U:19.464 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site