diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2013-04-13 22:49:14 +0300 |
|---|---|---|
| committer | Harshada Kale <hkale@nvidia.com> | 2013-05-15 00:55:09 -0700 |
| commit | 2061771cf4deec40d7683299e22c548c5076396d (patch) | |
| tree | 4f2ebc88aa0a4b1f1eaded1bbefc3310721da0fb /kernel | |
| parent | d803d67de4cfe12e7544a3c7303e30c0e79b6708 (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>
(cherry picked from commit 8176cced706b5e5d15887584150764894e94e02f)
Change-Id: Ie1dd9b0d40980fbbf8499528964c01cc71efd46c
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/228455
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
GVS: Gerrit_Virtual_Submit
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 228fdb042fad..839a24f1ddeb 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5126,7 +5126,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; |