openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

This commit is contained in:
Ingo Molnar 2011-09-30 20:08:56 +02:00
parent 47ea91b405 8e303f20f4
commit 9d3ec7a0c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/perf/util/evsel.c
View File

@ -449,6 +449,8 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
} }
if (type & PERF_SAMPLE_RAW) { if (type & PERF_SAMPLE_RAW) {
const u64 *pdata;
u.val64 = *array; u.val64 = *array;
if (WARN_ONCE(swapped, if (WARN_ONCE(swapped,
"Endianness of raw data not corrected!\n")) { "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; return -EFAULT;
data->raw_size = u.val32[0]; 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; return -EFAULT;
data->raw_data = &u.val32[1]; data->raw_data = (void *) pdata;
} }
return 0; return 0;