diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2013-06-12 17:13:33 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-12 17:13:33 +0200 |
| commit | 755f1f565b9485c62ac5843c9e5f9c71eab3d859 (patch) | |
| tree | d6fd99ab15a7aad4addb1ea07ab498e1873bd841 | |
| parent | 1cf5b12ae23d95fd9d09c8576672467ec65641b5 (diff) | |
| download | kernel_samsung_espresso10-755f1f565b9485c62ac5843c9e5f9c71eab3d859.tar.gz kernel_samsung_espresso10-755f1f565b9485c62ac5843c9e5f9c71eab3d859.tar.bz2 kernel_samsung_espresso10-755f1f565b9485c62ac5843c9e5f9c71eab3d859.zip | |
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").
Change-Id: If77d4ac7c7812e14717d7d7717900be740d6223e
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 32a61513f89..e1558f6dd29 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; |