diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-05-07 02:12:44 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-05-07 02:12:44 +0200 |
| commit | f87b87a1c969f767b9938d435f0211d293e323db (patch) | |
| tree | b315d103bc610caf0682329320839ec8dc51fa59 /security | |
| parent | Merge branch 'bpf-rv64-jit' (diff) | |
| parent | capabilities: Introduce CAP_PERFMON to kernel and user space (diff) | |
| download | linux-f87b87a1c969f767b9938d435f0211d293e323db.tar.xz linux-f87b87a1c969f767b9938d435f0211d293e323db.zip | |
Merge tag 'perf-for-bpf-2020-05-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into bpf-next
CAP_PERFMON for BPF
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/include/classmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 986f3ac14282..d233ab3f1533 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -27,9 +27,9 @@ "audit_control", "setfcap" #define COMMON_CAP2_PERMS "mac_override", "mac_admin", "syslog", \ - "wake_alarm", "block_suspend", "audit_read" + "wake_alarm", "block_suspend", "audit_read", "perfmon" -#if CAP_LAST_CAP > CAP_AUDIT_READ +#if CAP_LAST_CAP > CAP_PERFMON #error New capability defined, please update COMMON_CAP2_PERMS. #endif |