Commit 8176cced authored by Tommi Rantala's avatar Tommi Rantala Committed by Ingo Molnar

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: default avatarTommi 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.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 41ef2d56
...@@ -5331,7 +5331,7 @@ static void sw_perf_event_destroy(struct perf_event *event) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment