On Thu, Aug 08, 2013 at 12:18:08AM +0100, Stephen Boyd wrote:
> Is config some really big value? It looks like config (or more
> specifically event->attr.config) is ecececec which is larger than 9
> (PERF_COUNT_HW_MAX). I'm fairly certain r4 is event->attr.type
> (PERF_TYPE_HARDWARE) and so we're out of bounds on that array access in
> armpmu_map_hw_event(). Does the below patch fix that?
>
> ---8<----
>
> diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
> index d9f5cd4..21f7790 100644
> --- 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];
Well spotted, thanks. If you make that return -EINVAL instead of -ENOENT (to
match what we do for cache events) then:
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Could you stick it in the patch system please?
Thanks Stephen,
Will
--
To unsubscribe from this list: send the line "unsubscribe trinity" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
