Re: [PATCH] perf: Fix swapping of cpu_map and stat_config records

[Jiri Olsa]

On Thu, May 06, 2021 at 01:11:49PM +0000, Dmitry Koshelev wrote:
> 'data' field in perf_record_cpu_map_data struct is 16-bit
> wide and so should be swapped using bswap_16().
> 
> 'nr' field in perf_record_stat_config struct should be
> swapped before being used for size calculation.
> 
> Signed-off-by: Dmitry Koshelev <karaghiozis@xxxxxxxxx>

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

thanks,
jirka

> ---
>  tools/perf/util/session.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index a12cf4f0e97a..106b3d60881a 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -904,7 +904,7 @@ static void perf_event__cpu_map_swap(union perf_event *event,
>  	struct perf_record_record_cpu_map *mask;
>  	unsigned i;
>  
> -	data->type = bswap_64(data->type);
> +	data->type = bswap_16(data->type);
>  
>  	switch (data->type) {
>  	case PERF_CPU_MAP__CPUS:
> @@ -937,7 +937,7 @@ static void perf_event__stat_config_swap(union perf_event *event,
>  {
>  	u64 size;
>  
> -	size  = event->stat_config.nr * sizeof(event->stat_config.data[0]);
> +	size  = bswap_64(event->stat_config.nr) * sizeof(event->stat_config.data[0]);
>  	size += 1; /* nr item itself */
>  	mem_bswap_64(&event->stat_config.nr, size);
>  }
> -- 
> 2.25.1
>