-
- Downloads
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2023-06-07 We've added 7 non-merge commits during the last 7 day(s) which contain a total of 12 files changed, 112 insertions(+), 7 deletions(-). The main changes are: 1) Fix a use-after-free in BPF's task local storage, from KP Singh. 2) Make struct path handling more robust in bpf_d_path, from Jiri Olsa. 3) Fix a syzbot NULL-pointer dereference in sockmap, from Eric Dumazet. 4) UAPI fix for BPF_NETFILTER before final kernel ships, from Florian Westphal. 5) Fix map-in-map array_map_gen_lookup code generation where elem_size was not being set for inner maps, from Rhys Rustad-Elliott. 6) Fix sockopt_sk selftest's NETLINK_LIST_MEMBERSHIPS assertion, from Yonghong Song. * tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: bpf: Add extra path pointer check to d_path helper selftests/bpf: Fix sockopt_sk selftest bpf: netfilter: Add BPF_NETFILTER bpf_attach_type selftests/bpf: Add access_inner_map selftest bpf: Fix elem_size not being set for inner maps bpf: Fix UAF in task local storage bpf, sockmap: Avoid potential NULL dereference in sk_psock_verdict_data_ready() ==================== Link: https://lore.kernel.org/r/20230607220514.29698-1-daniel@iogearbox.net Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- include/uapi/linux/bpf.h 1 addition, 0 deletionsinclude/uapi/linux/bpf.h
- kernel/bpf/map_in_map.c 6 additions, 2 deletionskernel/bpf/map_in_map.c
- kernel/bpf/syscall.c 9 additions, 0 deletionskernel/bpf/syscall.c
- kernel/fork.c 1 addition, 1 deletionkernel/fork.c
- kernel/trace/bpf_trace.c 11 additions, 1 deletionkernel/trace/bpf_trace.c
- net/core/skmsg.c 2 additions, 1 deletionnet/core/skmsg.c
- tools/include/uapi/linux/bpf.h 1 addition, 0 deletionstools/include/uapi/linux/bpf.h
- tools/lib/bpf/libbpf.c 2 additions, 1 deletiontools/lib/bpf/libbpf.c
- tools/lib/bpf/libbpf_probes.c 2 additions, 0 deletionstools/lib/bpf/libbpf_probes.c
- tools/testing/selftests/bpf/prog_tests/inner_array_lookup.c 31 additions, 0 deletionstools/testing/selftests/bpf/prog_tests/inner_array_lookup.c
- tools/testing/selftests/bpf/prog_tests/sockopt_sk.c 1 addition, 1 deletiontools/testing/selftests/bpf/prog_tests/sockopt_sk.c
- tools/testing/selftests/bpf/progs/inner_array_lookup.c 45 additions, 0 deletionstools/testing/selftests/bpf/progs/inner_array_lookup.c
Loading
Please register or sign in to comment