Merge "ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()" (4f55d4d7) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/kernel/perf_event.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,12 @@ armpmu_map_cache_event(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 -EINVAL;

		mapping = (*event_map)[config];
		return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;
		}