From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042924.110173852@goodmis.org> Date: Wed, 11 Sep 2013 00:30:19 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: , Ingo Molnar Subject: [192/251] perf/arm: Fix armpmu_map_hw_event() References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0192-perf-arm-Fix-armpmu_map_hw_event.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Boyd [ Upstream commit b88a2595b6d8aedbd275c07dfa784657b4f757eb ] Fix constraint check in armpmu_map_hw_event(). Reported-and-tested-by: Vince Weaver Cc: Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds Signed-off-by: Steven Rostedt --- arch/arm/kernel/perf_event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 5770b9d..22a022a 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -106,7 +106,12 @@ armpmu_map_cache_event(const unsigned (*cache_map) static int 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 -ENOENT; + + mapping = (*event_map)[config]; return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping; } -- 1.7.10.4