Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2020-11-28 1) Do not reference the skb for xsk's generic TX side since when looped back into RX it might crash in generic XDP, from Björn Töpel. 2) Fix umem cleanup on a partially set up xsk socket when being destroyed, from Magnus Karlsson. 3) Fix an incorrect netdev reference count when failing xsk_bind() operation, from Marek Majtyka. 4) Fix bpftool to set an error code on failed calloc() in build_btf_type_table(), from Zhen Lei. * https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: bpf: Add MAINTAINERS entry for BPF LSM bpftool: Fix error return value in build_btf_type_table net, xsk: Avoid taking multiple skbuff references xsk: Fix incorrect netdev reference count xsk: Fix umem cleanup bug at socket destruct MAINTAINERS: Update XDP and AF_XDP entries ==================== Link: https://lore.kernel.org/r/20201128005104.1205-1-daniel@iogearbox.net Signed-off-by:Jakub Kicinski <kuba@kernel.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 21 additions, 2 deletionsMAINTAINERS
- include/linux/netdevice.h 13 additions, 1 deletioninclude/linux/netdevice.h
- include/net/xdp_sock.h 1 addition, 0 deletionsinclude/net/xdp_sock.h
- net/core/dev.c 2 additions, 6 deletionsnet/core/dev.c
- net/xdp/xdp_umem.c 16 additions, 3 deletionsnet/xdp/xdp_umem.c
- net/xdp/xdp_umem.h 1 addition, 1 deletionnet/xdp/xdp_umem.h
- net/xdp/xsk.c 2 additions, 8 deletionsnet/xdp/xsk.c
- net/xdp/xsk_buff_pool.c 4 additions, 2 deletionsnet/xdp/xsk_buff_pool.c
- tools/bpf/bpftool/btf.c 1 addition, 0 deletionstools/bpf/bpftool/btf.c
Loading
Please register or sign in to comment