lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf tools: Pre-check sample size before parsing

Browse Source 
Check that the total size of the sample fields having a fixed
size do not exceed the one of the whole event. This robustifies
the sample parsing.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
This commit is contained in:
Frederic Weisbecker
2011-05-21 19:33:04 +02:00
parent 74429964d8
commit a285412479
7 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,7 +304,8 @@ static int perf_event__parse_id_sample(const union perf_event *event, u64 type,
}
int perf_event__parse_sample(const union perf_event *event, u64 type,
bool sample_id_all, struct perf_sample *data)
int sample_size, bool sample_id_all,
struct perf_sample *data)
{
const u64 *array;
@@ -319,6 +320,9 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
array = event->sample.array;
if (sample_size + sizeof(event->header) > event->header.size)
return -EFAULT;
if (type & PERF_SAMPLE_IP) {
data->ip = event->ip.ip;
array++;