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 Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Git-repo: https://android.googlesource.com/kernel/common.git Git-commit: 012b0adcf7299f6509d4984cf46ee11e6eaed4e4 [d-cagle@codeaurora.org: Resolve trivial merge conflicts] Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org> Bug: 29054680 Change-Id: Iff5bff4fc1042e85866df9faa01bce8d04335ab8
This commit is contained in:
parent
a647f40d2b
commit
1a565f59cb
4 changed files with 23 additions and 1 deletions
|
@ -653,12 +653,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
|
||||
|
||||
==============================================================
|
||||
|
||||
|
|
|
@ -992,6 +992,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;
|
||||
|
|
|
@ -176,9 +176,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
|
||||
|
@ -8325,6 +8328,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;
|
||||
|
|
|
@ -23,6 +23,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
|
||||
|
|
Loading…
Add table
Reference in a new issue