From 60701bc1fe7c8e8a59f798762302d7d3a4c5aad9 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Mon, 9 Mar 2020 22:25:47 +0000 Subject: [PATCH] Revert remainings of "ANDROID: security,perf: Allow further restriction of perf_event_open" When reverting commit 5dbd8df7b356 ("ANDROID: security,perf: Allow further restriction of perf_event_open") with commit e92b6ef8fc96 ("Revert "ANDROID: security,perf: Allow further restriction of perf_event_open""), some lines were left out. Remove that dead code. Fixes: e92b6ef8fc96 ("Revert "ANDROID: security,perf: Allow further restriction of perf_event_open"") Signed-off-by: Matthias Maennich Change-Id: Ia53795c909fdb6686176e6a1540f793e248f13a3 --- include/linux/perf_event.h | 5 ----- kernel/events/core.c | 3 --- 2 files changed, 8 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index cc7841047de9..547773f5894e 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1270,11 +1270,6 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, int perf_event_max_stack_handler(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); -static inline bool perf_paranoid_any(void) -{ - return sysctl_perf_event_paranoid > 2; -} - /* Access to perf_event_open(2) syscall. */ #define PERF_SECURITY_OPEN 0 diff --git a/kernel/events/core.c b/kernel/events/core.c index 60a5ad2fa6e0..e453589da97c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11184,9 +11184,6 @@ SYSCALL_DEFINE5(perf_event_open, if (err) return err; - if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN)) - return -EACCES; - err = perf_copy_attr(attr_uptr, &attr); if (err) return err;