mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent
This commit is contained in:
commit
9d3ec7a0c4
1 changed files with 5 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue