Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e303f20 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix raw sample reading 



Wrong pointer is being passed for raw data sanity checking, when parsing
sample event.

This ends up with invalid event and perf record being stuck in
__perf_session__process_events function during processing build IDs
(process_buildids function).

Following command hangs up in my setup:
	./perf record -e raw_syscalls:sys_enter ls

The fix is to use proper pointer to the raw data instead of the 'u'
union.

Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1317308709-9474-2-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2b022a82

tools/perf/util/evsel.c

+5 −2
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, 
	}



	if (type & PERF_SAMPLE_RAW) {

		const u64 *pdata;



		u.val64 = *array;

		if (WARN_ONCE(swapped,

			      "Endianness of raw data not corrected!\n")) {
@@ -462,11 +464,12 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, 
			return -EFAULT;



		data->raw_size = u.val32[0];

		pdata = (void *) array + sizeof(u32);



		if (sample_overlap(event, &u.val32[1], data->raw_size))

		if (sample_overlap(event, pdata, data->raw_size))

			return -EFAULT;



		data->raw_data = &u.val32[1];

		data->raw_data = (void *) pdata;

	}



	return 0;