diff options
author | Will Deacon <will.deacon@arm.com> | 2012-03-06 11:34:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-07 04:40:49 -0500 |
commit | f6f5a30c834135c9f2fa10400c59ebbdd9188567 (patch) | |
tree | 208358216772eedab5998070878db55df5d4e772 /arch/arm/kernel/perf_event_v7.c | |
parent | 99c1745b9c76910e195889044f914b4898b7c9a5 (diff) |
ARM: 7356/1: perf: check that we have an event in the PMU IRQ handlers
The PMU IRQ handlers in perf assume that if a counter has overflowed
then perf must be responsible. In the paranoid world of crazy hardware,
this could be false, so check that we do have a valid event before
attempting to dereference NULL in the interrupt path.
Cc: <stable@vger.kernel.org>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/perf_event_v7.c')
-rw-r--r-- | arch/arm/kernel/perf_event_v7.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index 050cc8bf7246..4d7095af2ab3 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c | |||
@@ -960,6 +960,10 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) | |||
960 | struct perf_event *event = cpuc->events[idx]; | 960 | struct perf_event *event = cpuc->events[idx]; |
961 | struct hw_perf_event *hwc; | 961 | struct hw_perf_event *hwc; |
962 | 962 | ||
963 | /* Ignore if we don't have an event. */ | ||
964 | if (!event) | ||
965 | continue; | ||
966 | |||
963 | /* | 967 | /* |
964 | * We have a single interrupt for all counters. Check that | 968 | * We have a single interrupt for all counters. Check that |
965 | * each counter has overflowed before we process it. | 969 | * each counter has overflowed before we process it. |