diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-08-08 01:18:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-14 01:57:24 +0200 |
| commit | b88a2595b6d8aedbd275c07dfa784657b4f757eb (patch) | |
| tree | 20d598a31e66d3a1e2fa0c49970c11f55a67f4e2 /arch | |
| parent | sched: fix the theoretical signal_wake_up() vs schedule() race (diff) | |
| download | linux-b88a2595b6d8aedbd275c07dfa784657b4f757eb.tar.xz linux-b88a2595b6d8aedbd275c07dfa784657b4f757eb.zip | |
perf/arm: Fix armpmu_map_hw_event()
Fix constraint check in armpmu_map_hw_event().
Reported-and-tested-by: Vince Weaver <vincent.weaver@maine.edu>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index d9f5cd4e533f..21f77906602c 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -53,7 +53,12 @@ armpmu_map_cache_event(const unsigned (*cache_map) static int armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config) { - int mapping = (*event_map)[config]; + int mapping; + + if (config >= PERF_COUNT_HW_MAX) + return -ENOENT; + + mapping = (*event_map)[config]; return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping; } |