[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-8176cced706b5e5d15887584150764894e94e02f@git.kernel.org>
Date: Mon, 15 Apr 2013 03:42:01 -0700
From: tip-bot for Tommi Rantala <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, paulus@...ba.org, hpa@...or.com,
mingo@...nel.org, a.p.zijlstra@...llo.nl, acme@...stprotocols.net,
tglx@...utronix.de, tt.rantala@...il.com
Subject: [tip:perf/urgent] perf:
Treat attr.config as u64 in perf_swevent_init()
Commit-ID: 8176cced706b5e5d15887584150764894e94e02f
Gitweb: http://git.kernel.org/tip/8176cced706b5e5d15887584150764894e94e02f
Author: Tommi Rantala <tt.rantala@...il.com>
AuthorDate: Sat, 13 Apr 2013 22:49:14 +0300
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 15 Apr 2013 11:42:12 +0200
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@...il.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: davej@...hat.com
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7e0962e..4d3124b 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5331,7 +5331,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists