diff options
author | Tommi Rantala <tt.rantala@gmail.com> | 2013-04-13 19:49:14 +0000 |
---|---|---|
committer | Todd Poynor <toddpoynor@google.com> | 2013-05-14 19:24:37 -0700 |
commit | db73373fbade7eca18996a604443245d17cac583 (patch) | |
tree | c96f0e9b425a8b4b5db9bc6e5a62507c5f45806d /kernel | |
parent | 59bc19226c746f479edc2acca9a41f60669cbe82 (diff) | |
download | kernel_samsung_tuna-db73373fbade7eca18996a604443245d17cac583.zip kernel_samsung_tuna-db73373fbade7eca18996a604443245d17cac583.tar.gz kernel_samsung_tuna-db73373fbade7eca18996a604443245d17cac583.tar.bz2 |
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 7b344be..b582650 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5440,7 +5440,7 @@ static void sw_perf_event_destroy(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) return -ENOENT; |