Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf_event: Fix raw event processing

Browse Source 
We use 'data.raw_data' parameter to call process_raw_event(),
but data.raw_data buffer not include data size. it can make perf
tool crash.

This bug was introduced by commit 180f95e29a ("perf: Make common
SAMPLE_EVENT parser").

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4B1C7F45.5080105@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Xiao Guangrong 2009-12-07 12:06:29 +08:00 committed by Ingo Molnar
parent c0777c5aa8
commit d8bd9e0aed
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/builtin-kmem.c
View File

@ -289,13 +289,17 @@ static void process_free_event(struct raw_event_sample *raw,
} }
static void static void
process_raw_event(event_t *raw_event __used, void *more_data, process_raw_event(event_t *raw_event __used, u32 size, void *data,
int cpu, u64 timestamp, struct thread *thread) int cpu, u64 timestamp, struct thread *thread)
{ {
struct raw_event_sample *raw = more_data; struct raw_event_sample *raw;
struct event *event; struct event *event;
int type; int type;
raw = malloc_or_die(sizeof(*raw)+size);
raw->size = size;
memcpy(raw->data, data, size);
type = trace_parse_common_type(raw->data); type = trace_parse_common_type(raw->data);
event = trace_find_event(type); event = trace_find_event(type);
@ -345,7 +349,8 @@ static int process_sample_event(event_t *event)
dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid); dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);
process_raw_event(event, data.raw_data, data.cpu, data.time, thread); process_raw_event(event, data.raw_size, data.raw_data, data.cpu,
data.time, thread);
return 0; return 0;
} }

11
tools/perf/builtin-sched.c
View File

@ -1570,13 +1570,17 @@ process_sched_migrate_task_event(struct raw_event_sample *raw,
} }
static void static void
process_raw_event(event_t *raw_event __used, void *more_data, process_raw_event(event_t *raw_event __used, u32 size, void *data,
int cpu, u64 timestamp, struct thread *thread) int cpu, u64 timestamp, struct thread *thread)
{ {
struct raw_event_sample *raw = more_data; struct raw_event_sample *raw;
struct event *event; struct event *event;
int type; int type;
raw = malloc_or_die(sizeof(*raw)+size);
raw->size = size;
memcpy(raw->data, data, size);
type = trace_parse_common_type(raw->data); type = trace_parse_common_type(raw->data);
event = trace_find_event(type); event = trace_find_event(type);
@ -1629,7 +1633,8 @@ static int process_sample_event(event_t *event)
if (profile_cpu != -1 && profile_cpu != (int)data.cpu) if (profile_cpu != -1 && profile_cpu != (int)data.cpu)
return 0; return 0;
process_raw_event(event, data.raw_data, data.cpu, data.time, thread); process_raw_event(event, data.raw_size, data.raw_data, data.cpu,
data.time, thread);
return 0; return 0;
} }