diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-10-26 18:30:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-26 18:30:55 -0700 |
| commit | 1a51a47491a5a23f0625b03ad6dc84cf39bf6a82 (patch) | |
| tree | d2089bedb4a4ff10a9f03c197a6e78966dfbb7a4 /include | |
| parent | Merge branch 'ipv4-fix-route-update-on-metric-change' (diff) | |
| parent | xsk: Fix registration of Rx-only sockets (diff) | |
| download | linux-dev-1a51a47491a5a23f0625b03ad6dc84cf39bf6a82.tar.xz linux-dev-1a51a47491a5a23f0625b03ad6dc84cf39bf6a82.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2019-10-27
The following pull-request contains BPF updates for your *net* tree.
We've added 7 non-merge commits during the last 11 day(s) which contain
a total of 7 files changed, 66 insertions(+), 16 deletions(-).
The main changes are:
1) Fix two use-after-free bugs in relation to RCU in jited symbol exposure to
kallsyms, from Daniel Borkmann.
2) Fix NULL pointer dereference in AF_XDP rx-only sockets, from Magnus Karlsson.
3) Fix hang in netdev unregister for hash based devmap as well as another overflow
bug on 32 bit archs in memlock cost calculation, from Toke Høiland-Jørgensen.
4) Fix wrong memory access in LWT BPF programs on reroute due to invalid dst.
Also fix BPF selftests to use more compatible nc options, from Jiri Benc.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 2ce57645f3cd..0367a75f873b 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -1099,7 +1099,6 @@ static inline void bpf_get_prog_name(const struct bpf_prog *prog, char *sym) #endif /* CONFIG_BPF_JIT */ -void bpf_prog_kallsyms_del_subprogs(struct bpf_prog *fp); void bpf_prog_kallsyms_del_all(struct bpf_prog *fp); #define BPF_ANC BIT(15) |