diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-08-07 16:18:08 -0700 |
|---|---|---|
| committer | Doug Zobel <dzobel1@motorola.com> | 2014-08-12 12:53:16 -0500 |
| commit | f7077ccbe135508edfa44a0ededf9571058b636b (patch) | |
| tree | 5038a12bcacc2f3907cdd4d8e2c60d5c3f1ebbbe | |
| parent | 2473ed0dffb0ce42cc0f6a0be1ba39c991429364 (diff) | |
| download | olio-linux-3.10-f7077ccbe135508edfa44a0ededf9571058b636b.tar.xz olio-linux-3.10-f7077ccbe135508edfa44a0ededf9571058b636b.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>
| -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 8c3094d0f7b..f058675737e 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; } |