diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2013-04-13 22:49:14 +0300 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-05-16 03:28:33 -0700 |
| commit | 058a7e8b33565381062f1926e7a69d416432effe (patch) | |
| tree | 21ce6ec4b759670a618600c6d7c0b22d8d527ea5 /kernel | |
| parent | 2af3f3a5233dfa47836b12b548acc17db947f113 (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: I5ecfb388007fba52435b49ac38855d1873ca63db
Signed-off-by: Bo Yan <byan@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/228787
Reviewed-by: Automatic_Commit_Validation_User
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 fd126f82b57c..aafa4c1acd99 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5118,7 +5118,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; |