diff options
author | Tommi Rantala <tt.rantala@gmail.com> | 2013-04-13 19:49:14 +0000 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-08-12 13:11:59 +0800 |
commit | 0a92c23c6ca96f6fb602be227fa4f019d3a765cd (patch) | |
tree | a3dc06e49d22bc1859835ddc79c06ecabb439046 | |
parent | e1bebc635eeb6b5cc5248d4ef9a1d1981ac31bc7 (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>
-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 32a61513f890..e1558f6dd298 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5432,7 +5432,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; |