From 83f0fa9c4526846f2526dec24bacf02f2ce9ab4b Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 10 Aug 2009 11:20:12 +0200
Subject: [PATCH] --- yaml --- r: 156638 b: refs/heads/master c:
 a4e95fc2cbb31d70a65beffeaf8773f881328c34 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8b58503a07ad..6767bf51cee0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a044560c3a1f0ad75ce685c1ed7604820b9ed319
+refs/heads/master: a4e95fc2cbb31d70a65beffeaf8773f881328c34
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index 5229d1666fa5..b0b20a07f394 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -3787,6 +3787,14 @@ static void tp_perf_counter_destroy(struct perf_counter *counter)
 
 static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)
 {
+	/*
+	 * Raw tracepoint data is a severe data leak, only allow root to
+	 * have these.
+	 */
+	if ((counter->attr.sample_type & PERF_SAMPLE_RAW) &&
+			!capable(CAP_SYS_ADMIN))
+		return ERR_PTR(-EPERM);
+
 	if (ftrace_profile_enable(counter->attr.config))
 		return NULL;