projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0acd0a
)
perf/arm: Fix armpmu_map_hw_event()
author
Stephen Boyd
<
[email protected]
>
Wed, 7 Aug 2013 23:18:08 +0000
(16:18 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 13 Aug 2013 23:57:24 +0000
(16:57 -0700)
Fix constraint check in armpmu_map_hw_event().
Reported-and-tested-by: Vince Weaver <
[email protected]
>
Cc: <
[email protected]
>
Signed-off-by: Ingo Molnar <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
arch/arm/kernel/perf_event.c
patch
|
blob
|
history
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index d9f5cd4e533fef948f68510e3a6fb3b4996b750b..21f77906602c2e5b0ae9911fb2df65e71430eb9e 100644
(file)
--- 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;
}