diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-15 10:43:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-15 10:43:52 -0700 |
| commit | 3430223d393dd23734cc87177d704449cfc294a8 (patch) | |
| tree | 8a82f0640e498d463d8b059aa0dabb27e5214b13 /drivers/media/rc/bpf-lirc.c | |
| parent | net: dsa: mt7530: fix VLAN setup (diff) | |
| parent | Merge branch 'bpf-cap' (diff) | |
| download | wireguard-linux-3430223d393dd23734cc87177d704449cfc294a8.tar.xz wireguard-linux-3430223d393dd23734cc87177d704449cfc294a8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-05-15
The following pull-request contains BPF updates for your *net-next* tree.
We've added 37 non-merge commits during the last 1 day(s) which contain
a total of 67 files changed, 741 insertions(+), 252 deletions(-).
The main changes are:
1) bpf_xdp_adjust_tail() now allows to grow the tail as well, from Jesper.
2) bpftool can probe CONFIG_HZ, from Daniel.
3) CAP_BPF is introduced to isolate user processes that use BPF infra and
to secure BPF networking services by dropping CAP_SYS_ADMIN requirement
in certain cases, from Alexei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/rc/bpf-lirc.c')
| -rw-r--r-- | drivers/media/rc/bpf-lirc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c index 069c42f22a8c..5bb144435c16 100644 --- a/drivers/media/rc/bpf-lirc.c +++ b/drivers/media/rc/bpf-lirc.c @@ -110,7 +110,7 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_get_prandom_u32: return &bpf_get_prandom_u32_proto; case BPF_FUNC_trace_printk: - if (capable(CAP_SYS_ADMIN)) + if (perfmon_capable()) return bpf_get_trace_printk_proto(); /* fall through */ default: |