Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8bd9e0a authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Ingo Molnar
Browse files

perf_event: Fix raw event processing 



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 180f95e2 ("perf: Make common
SAMPLE_EVENT parser").

Signed-off-by: default avatarXiao 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: default avatarIngo Molnar <mingo@elte.hu>
parent c0777c5a

tools/perf/builtin-kmem.c

+8 −3
Original line number Diff line number Diff line
@@ -289,13 +289,17 @@ static void process_free_event(struct raw_event_sample *raw, 
}



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)

{

	struct raw_event_sample *raw = more_data;

	struct raw_event_sample *raw;

	struct event *event;

	int type;



	raw = malloc_or_die(sizeof(*raw)+size);

	raw->size = size;

	memcpy(raw->data, data, size);



	type = trace_parse_common_type(raw->data);

	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);



	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;

}

tools/perf/builtin-sched.c

+8 −3
Original line number Diff line number Diff line
@@ -1570,13 +1570,17 @@ process_sched_migrate_task_event(struct raw_event_sample *raw, 
}



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)

{

	struct raw_event_sample *raw = more_data;

	struct raw_event_sample *raw;

	struct event *event;

	int type;



	raw = malloc_or_die(sizeof(*raw)+size);

	raw->size = size;

	memcpy(raw->data, data, size);



	type = trace_parse_common_type(raw->data);

	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)

		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;

}