Commit 8176cced authored Apr 13, 2013 by Tommi Rantala Committed by Ingo Molnar Apr 15, 2013

perf: Treat attr.config as u64 in perf_swevent_init()



Trinity discovered that we fail to check all 64 bits of
attr.config passed by user space, resulting to out-of-bounds
access of the perf_swevent_enabled array in
sw_perf_event_destroy().

Introduced in commit b0a873eb ("perf: Register PMU
implementations").

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 41ef2d56

kernel/events/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5331,7 +5331,7 @@ static void sw_perf_event_destroy(struct perf_event *event)

	static int perf_swevent_init(struct perf_event *event)		static int perf_swevent_init(struct perf_event *event)
	{		{
	int event_id = event->attr.config;		u64 event_id = event->attr.config;

	if (event->attr.type != PERF_TYPE_SOFTWARE)		if (event->attr.type != PERF_TYPE_SOFTWARE)
	return -ENOENT;		return -ENOENT;

Admin message