mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
120 lines
4.1 KiB
Diff
120 lines
4.1 KiB
Diff
|
From 149cf87192059fab0cb49ec5c691783c3565c215 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jeff Vander Stoep <jeffv@google.com>
|
||
|
|
Date: Sun, 29 May 2016 14:22:32 -0700
|
||
|
|
Subject: FROMLIST: security,perf: Allow further restriction of perf_event_open
|
||
|
|
|
||
|
|
When kernel.perf_event_open is set to 3 (or greater), disallow all
|
||
|
|
access to performance events by users without CAP_SYS_ADMIN.
|
||
|
|
Add a Kconfig symbol CONFIG_SECURITY_PERF_EVENTS_RESTRICT that
|
||
|
|
makes this value the default.
|
||
|
|
|
||
|
|
This is based on a similar feature in grsecurity
|
||
|
|
(CONFIG_GRKERNSEC_PERF_HARDEN). This version doesn't include making
|
||
|
|
the variable read-only. It also allows enabling further restriction
|
||
|
|
at run-time regardless of whether the default is changed.
|
||
|
|
|
||
|
|
https://lkml.org/lkml/2016/1/11/587
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
kernel/events/core.c
|
||
|
|
|
||
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||
|
|
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
|
||
|
|
Bug: 29054680
|
||
|
|
Bug: 29119870
|
||
|
|
Change-Id: Iff5bff4fc1042e85866df9faa01bce8d04335ab8
|
||
|
|
(cherry picked from commit f16929ac8586f37949c638c738a6f0de969ed1ea)
|
||
|
|
---
|
||
|
|
Documentation/sysctl/kernel.txt | 4 +++-
|
||
|
|
include/linux/perf_event.h | 5 +++++
|
||
|
|
kernel/events/core.c | 6 ++++++
|
||
|
|
security/Kconfig | 9 +++++++++
|
||
|
|
4 files changed, 23 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
|
||
|
|
index 942d769..d438fd2 100644
|
||
|
|
--- a/Documentation/sysctl/kernel.txt
|
||
|
|
+++ b/Documentation/sysctl/kernel.txt
|
||
|
|
@@ -492,12 +492,14 @@ the existing panic controls already in that directory.
|
||
|
|
perf_event_paranoid:
|
||
|
|
|
||
|
|
Controls use of the performance events system by unprivileged
|
||
|
|
-users (without CAP_SYS_ADMIN). The default value is 1.
|
||
|
|
+users (without CAP_SYS_ADMIN). The default value is 3 if
|
||
|
|
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT is set, or 1 otherwise.
|
||
|
|
|
||
|
|
-1: Allow use of (almost) all events by all users
|
||
|
|
>=0: Disallow raw tracepoint access by users without CAP_IOC_LOCK
|
||
|
|
>=1: Disallow CPU event access by users without CAP_SYS_ADMIN
|
||
|
|
>=2: Disallow kernel profiling by users without CAP_SYS_ADMIN
|
||
|
|
+>=3: Disallow all event access by users without CAP_SYS_ADMIN
|
||
|
|
|
||
|
|
==============================================================
|
||
|
|
|
||
|
|
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
|
||
|
|
index 4410efa..86b43c1 100644
|
||
|
|
--- a/include/linux/perf_event.h
|
||
|
|
+++ b/include/linux/perf_event.h
|
||
|
|
@@ -715,6 +715,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
|
||
|
|
loff_t *ppos);
|
||
|
|
|
||
|
|
|
||
|
|
+static inline bool perf_paranoid_any(void)
|
||
|
|
+{
|
||
|
|
+ return sysctl_perf_event_paranoid > 2;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static inline bool perf_paranoid_tracepoint_raw(void)
|
||
|
|
{
|
||
|
|
return sysctl_perf_event_paranoid > -1;
|
||
|
|
diff --git a/kernel/events/core.c b/kernel/events/core.c
|
||
|
|
index 7ab36de..e8cae75 100644
|
||
|
|
--- a/kernel/events/core.c
|
||
|
|
+++ b/kernel/events/core.c
|
||
|
|
@@ -166,9 +166,12 @@ static struct srcu_struct pmus_srcu;
|
||
|
|
* 0 - disallow raw tracepoint access for unpriv
|
||
|
|
* 1 - disallow cpu events for unpriv
|
||
|
|
* 2 - disallow kernel profiling for unpriv
|
||
|
|
+ * 3 - disallow all unpriv perf event use
|
||
|
|
*/
|
||
|
|
#ifdef CONFIG_PERF_EVENTS_USERMODE
|
||
|
|
int sysctl_perf_event_paranoid __read_mostly = -1;
|
||
|
|
+#elif defined CONFIG_SECURITY_PERF_EVENTS_RESTRICT
|
||
|
|
+int sysctl_perf_event_paranoid __read_mostly = 3;
|
||
|
|
#else
|
||
|
|
int sysctl_perf_event_paranoid __read_mostly = 1;
|
||
|
|
#endif
|
||
|
|
@@ -6826,6 +6829,9 @@ SYSCALL_DEFINE5(perf_event_open,
|
||
|
|
if (flags & ~PERF_FLAG_ALL)
|
||
|
|
return -EINVAL;
|
||
|
|
|
||
|
|
+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
|
||
|
|
+ return -EACCES;
|
||
|
|
+
|
||
|
|
err = perf_copy_attr(attr_uptr, &attr);
|
||
|
|
if (err)
|
||
|
|
return err;
|
||
|
|
diff --git a/security/Kconfig b/security/Kconfig
|
||
|
|
index 0114543..66a5f80 100644
|
||
|
|
--- a/security/Kconfig
|
||
|
|
+++ b/security/Kconfig
|
||
|
|
@@ -18,6 +18,15 @@ config SECURITY_DMESG_RESTRICT
|
||
|
|
|
||
|
|
If you are unsure how to answer this question, answer N.
|
||
|
|
|
||
|
|
+config SECURITY_PERF_EVENTS_RESTRICT
|
||
|
|
+ bool "Restrict unprivileged use of performance events"
|
||
|
|
+ depends on PERF_EVENTS
|
||
|
|
+ help
|
||
|
|
+ If you say Y here, the kernel.perf_event_paranoid sysctl
|
||
|
|
+ will be set to 3 by default, and no unprivileged use of the
|
||
|
|
+ perf_event_open syscall will be permitted unless it is
|
||
|
|
+ changed.
|
||
|
|
+
|
||
|
|
config SECURITY
|
||
|
|
bool "Enable different security models"
|
||
|
|
depends on SYSFS
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|