diff options
author | Tommi Rantala <tt.rantala@gmail.com> | 2013-04-13 15:49:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-15 05:42:12 -0400 |
commit | 8176cced706b5e5d15887584150764894e94e02f (patch) | |
tree | 36cce7ca572582944651f686c0de806f1cfe0b0b /kernel | |
parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) |
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 b0a873ebb ("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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 7e0962ed7f8a..4d3124b39277 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -5331,7 +5331,7 @@ static void sw_perf_event_destroy(struct perf_event *event) | |||
5331 | 5331 | ||
5332 | static int perf_swevent_init(struct perf_event *event) | 5332 | static int perf_swevent_init(struct perf_event *event) |
5333 | { | 5333 | { |
5334 | int event_id = event->attr.config; | 5334 | u64 event_id = event->attr.config; |
5335 | 5335 | ||
5336 | if (event->attr.type != PERF_TYPE_SOFTWARE) | 5336 | if (event->attr.type != PERF_TYPE_SOFTWARE) |
5337 | return -ENOENT; | 5337 | return -ENOENT; |