Commit d8d9c282 authored Jan 20, 2012 by Stephane Eranian Committed by Arnaldo Carvalho de Melo Jan 30, 2012

perf tools: Fix strlen() bug in perf_event__synthesize_event_type()

The event_type record has a max length for the event name.

It's called MAX_EVENT_NAME.

The name may be truncated to fit the max length. But the header.size still
reflects the original name length. If that length is > MAX_EVENT_NAME, then the
header.size field is bogus. Fix this by using the length of the name after the
potential truncation.

Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120120094912.GA4882@quad


Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 0a84f007

tools/perf/util/header.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2105,7 +2105,7 @@ int perf_event__synthesize_event_type(struct perf_tool *tool,
		strncpy(ev.event_type.event_type.name, name, MAX_EVENT_NAME - 1);

		ev.event_type.header.type = PERF_RECORD_HEADER_EVENT_TYPE;
		size = strlen(name);
		size = strlen(ev.event_type.event_type.name);
		size = ALIGN(size, sizeof(u64));
		ev.event_type.header.size = sizeof(ev.event_type) -
		(sizeof(ev.event_type.event_type.name) - size);

Admin message