diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-15 05:31:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-15 05:31:21 +0200 |
| commit | d00f26b623333f2419f4c3b95ff11c8b1bb96f56 (patch) | |
| tree | fa1ae8e845b1b788168ecbba8bcec77633f4f683 /security | |
| parent | r8169: don't include linux/moduleparam.h (diff) | |
| parent | Merge branch 'expand-cg_skb-helpers' (diff) | |
| download | linux-d00f26b623333f2419f4c3b95ff11c8b1bb96f56.tar.xz linux-d00f26b623333f2419f4c3b95ff11c8b1bb96f56.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-05-14
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Merged tag 'perf-for-bpf-2020-05-06' from tip tree that includes CAP_PERFMON.
2) support for narrow loads in bpf_sock_addr progs and additional
helpers in cg-skb progs, from Andrey.
3) bpf benchmark runner, from Andrii.
4) arm and riscv JIT optimizations, from Luke.
5) bpf iterator infrastructure, from Yonghong.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 |