mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Revert "ANDROID: security,perf: Allow further restriction of perf_event_open"
Unfork Android.
This reverts commit 5dbd8df7b3.
Perf_event_paranoid=3 is no longer needed on Android. Access control
of perf events is now done by selinux. See:
https://patchwork.kernel.org/patch/11185793/
IGNORE_MERGE_CONFLICT_CHECK==kernel.rst documentation uses "====".
Bug: 120445712
Bug: 137092007
Signed-off-by: Jeff Vander Stoep <[email protected]>
Change-Id: Iba493424174b30baff460caaa25a54a472c87bd4
This commit is contained in:
parent
dc34c9f193
commit
020b443d55
6 changed files with 1 additions and 28 deletions
|
|
@ -398,13 +398,8 @@ static cpumask_var_t perf_online_mask;
|
|||
* 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_SECURITY_PERF_EVENTS_RESTRICT
|
||||
int sysctl_perf_event_paranoid __read_mostly = 3;
|
||||
#else
|
||||
int sysctl_perf_event_paranoid __read_mostly = 2;
|
||||
#endif
|
||||
|
||||
/* Minimum for 512 kiB + 1 user control page */
|
||||
int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
|
||||
|
|
@ -10927,9 +10922,6 @@ SYSCALL_DEFINE5(perf_event_open,
|
|||
if (flags & ~PERF_FLAG_ALL)
|
||||
return -EINVAL;
|
||||
|
||||
if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
|
||||
return -EACCES;
|
||||
|
||||
/* Do we allow access to perf_event_open(2) ? */
|
||||
err = security_perf_event_open(&attr, PERF_SECURITY_OPEN);
|
||||
if (err)
|
||||
|
|
|
|||
Loading…
Reference in a new issue