Commit 868f6fea authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas

arm64: perf: fix array out of bounds access in armpmu_map_hw_event()

This is a port of d9f96635 ("ARM: 7810/1: perf: Fix array out of
bounds access in armpmu_map_hw_event()") to arm64, which fixes an oops
in the arm64 perf backend found as a result of Vince's fuzzing tool.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent c095ba72
...@@ -107,7 +107,12 @@ armpmu_map_cache_event(const unsigned (*cache_map) ...@@ -107,7 +107,12 @@ armpmu_map_cache_event(const unsigned (*cache_map)
static int static int
armpmu_map_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config) armpmu_map_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 -EINVAL;
mapping = (*event_map)[config];
return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping; return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment