2 files changed, 26 insertions, 5 deletions

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 8b89b40bd0f0..63f1987c1c1c 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -43,7 +43,23 @@ static atomic_t nr_counters __read_mostly;
 static atomic_t nr_mmap_counters __read_mostly;
 static atomic_t nr_comm_counters __read_mostly;
 
-int sysctl_perf_counter_priv __read_mostly; /* do we need to be privileged */
+/*
+ * 0 - not paranoid
+ * 1 - disallow cpu counters to unpriv
+ * 2 - disallow kernel profiling to unpriv
+ */
+int sysctl_perf_counter_paranoid __read_mostly; /* do we need to be privileged */
+
+static inline bool perf_paranoid_cpu(void)
+{
+        return sysctl_perf_counter_paranoid > 0;
+}
+
+static inline bool perf_paranoid_kernel(void)
+{
+        return sysctl_perf_counter_paranoid > 1;
+}
+
 int sysctl_perf_counter_mlock __read_mostly = 512; /* 'free' kb per user */
 int sysctl_perf_counter_limit __read_mostly = 100000; /* max NMIs per second */
 
@@ -1385,7 +1401,7 @@ static struct perf_counter_context *find_get_context(pid_t pid, int cpu)
          */
         if (cpu != -1) {
                 /* Must be root to operate on a CPU counter: */
-                if (sysctl_perf_counter_priv && !capable(CAP_SYS_ADMIN))
+                if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
                         return ERR_PTR(-EACCES);
 
                 if (cpu < 0 || cpu > num_possible_cpus())
@@ -3618,6 +3634,11 @@ SYSCALL_DEFINE5(perf_counter_open,
         if (copy_from_user(&attr, attr_uptr, sizeof(attr)) != 0)
                 return -EFAULT;
 
+        if (!attr.exclude_kernel) {
+                if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
+                        return -EACCES;
+        }
+
         /*
          * Get the target context (task or percpu):
          */
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 0c4bf863afa3..344a65981dee 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -916,9 +916,9 @@ static struct ctl_table kern_table[] = {
 #ifdef CONFIG_PERF_COUNTERS
         {
                 .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "perf_counter_privileged",
-                .data           = &sysctl_perf_counter_priv,
-                .maxlen         = sizeof(sysctl_perf_counter_priv),
+                .procname       = "perf_counter_paranoid",
+                .data           = &sysctl_perf_counter_paranoid,
+                .maxlen         = sizeof(sysctl_perf_counter_paranoid),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },