diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-26 21:41:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-26 21:41:49 -0700 |
| commit | 6788fac82001ed1944b5da976bcec4a7b9accf51 (patch) | |
| tree | b003137f9b8cfceac884409216f61cbb2a2f4ddd /kernel/bpf/helpers.c | |
| parent | 345671ea0f9258f410eb057b9ced9cefbbe5dc78 (diff) | |
| parent | d8fd9e106fbc291167ebb675ad69234597d0fd98 (diff) | |
| download | linux-stable-6788fac82001ed1944b5da976bcec4a7b9accf51.tar.gz linux-stable-6788fac82001ed1944b5da976bcec4a7b9accf51.tar.bz2 linux-stable-6788fac82001ed1944b5da976bcec4a7b9accf51.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-10-27
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix toctou race in BTF header validation, from Martin and Wenwen.
2) Fix devmap interface comparison in notifier call which was
neglecting netns, from Taehee.
3) Several fixes in various places, for example, correcting direct
packet access and helper function availability, from Daniel.
4) Fix BPF kselftest config fragment to include af_xdp and sockmap,
from Naresh.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/helpers.c')
| -rw-r--r-- | kernel/bpf/helpers.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index ab0d5e3f9892..a74972b07e74 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -99,7 +99,6 @@ BPF_CALL_2(bpf_map_pop_elem, struct bpf_map *, map, void *, value) const struct bpf_func_proto bpf_map_pop_elem_proto = { .func = bpf_map_pop_elem, .gpl_only = false, - .pkt_access = true, .ret_type = RET_INTEGER, .arg1_type = ARG_CONST_MAP_PTR, .arg2_type = ARG_PTR_TO_UNINIT_MAP_VALUE, @@ -113,7 +112,6 @@ BPF_CALL_2(bpf_map_peek_elem, struct bpf_map *, map, void *, value) const struct bpf_func_proto bpf_map_peek_elem_proto = { .func = bpf_map_pop_elem, .gpl_only = false, - .pkt_access = true, .ret_type = RET_INTEGER, .arg1_type = ARG_CONST_MAP_PTR, .arg2_type = ARG_PTR_TO_UNINIT_MAP_VALUE, |