perf/arm: Fix armpmu_map_hw_event()

bebarino · gregkh · commit b6664dfcf057 · 2013-08-20T08:43:02.000-07:00
commit b88a259 upstream. Fix constraint check in armpmu_map_hw_event(). Reported-and-tested-by: Vince Weaver <vincent.weaver@maine.edu> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,12 @@ armpmu_map_cache_event(const unsigned (*cache_map)`
`53`	`53`	`static int`
`54`	`54`	`armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config)`
`55`	`55`	`{`
`56`		`- int mapping = (*event_map)[config];`
	`56`	`+ int mapping;`
	`57`	`+`
	`58`	`+ if (config >= PERF_COUNT_HW_MAX)`
	`59`	`+ return -ENOENT;`
	`60`	`+`
	`61`	`+ mapping = (*event_map)[config];`
`57`	`62`	`return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;`
`58`	`63`	`}`
`59`	`64`