perf fix

GIT PULL Ingo Molnar 1 participant 1 message Oct 1, 2011 perf events

lore

Share & tools

lore

Ingo Molnar

author

2011-10-01 07:53 UTC #0 lore raw

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

git://tesla.tglx.de/git/linux-2.6-tip.git perf-urgent-for-linus

Thanks,

Ingo

------------------>
Jiri Olsa (1):
perf tools: Fix raw sample reading

 tools/perf/util/evsel.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

tools/perf/util/evsel.c +5 -2

index c5748c5..e389815 100644
@@ -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;