Patchwork [7/7] perf: Treat attr.config as u64 in perf_swevent_init()

login
register
mail settings
Submitter Ricardo Salveti de Araujo
Date July 19, 2013, 6:51 p.m.
Message ID <1374259863-31477-1-git-send-email-ricardo.salveti@canonical.com>
Download mbox | patch
Permalink /patch/260325/
State New
Headers show

Comments

Ricardo Salveti de Araujo - July 19, 2013, 6:51 p.m.
From: Tommi Rantala <tt.rantala@gmail.com>

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: I9a46294b3732d5e04b14142f2e50b22a43ebc986
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>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>

 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 32a6151..e1558f6 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;