Merge branch 'getpeername'
Daniel Borkmann says:
====================
Trivial patch to add get{peer,sock}name cgroup attach types to the BPF
sock_addr programs in order to enable rewriting sockaddr structs from
both calls along with libbpf and bpftool support as well as selftests.
Thanks!
v1 -> v2:
- use __u16 for ports in start_server_with_port() signature and in
expected_{local,peer} ports in the test case (Andrey)
- Added both Andrii's and Andrey's ACKs
====================
Signed-off-by:
Alexei Starovoitov <ast@kernel.org>
No related branches found
No related tags found
Showing
- include/linux/bpf-cgroup.h 1 addition, 0 deletionsinclude/linux/bpf-cgroup.h
- include/uapi/linux/bpf.h 4 additions, 0 deletionsinclude/uapi/linux/bpf.h
- kernel/bpf/syscall.c 12 additions, 0 deletionskernel/bpf/syscall.c
- kernel/bpf/verifier.c 5 additions, 1 deletionkernel/bpf/verifier.c
- net/core/filter.c 4 additions, 0 deletionsnet/core/filter.c
- net/ipv4/af_inet.c 6 additions, 2 deletionsnet/ipv4/af_inet.c
- net/ipv6/af_inet6.c 6 additions, 3 deletionsnet/ipv6/af_inet6.c
- tools/bpf/bpftool/Documentation/bpftool-cgroup.rst 7 additions, 3 deletionstools/bpf/bpftool/Documentation/bpftool-cgroup.rst
- tools/bpf/bpftool/Documentation/bpftool-prog.rst 2 additions, 1 deletiontools/bpf/bpftool/Documentation/bpftool-prog.rst
- tools/bpf/bpftool/bash-completion/bpftool 9 additions, 6 deletionstools/bpf/bpftool/bash-completion/bpftool
- tools/bpf/bpftool/cgroup.c 4 additions, 3 deletionstools/bpf/bpftool/cgroup.c
- tools/bpf/bpftool/main.h 4 additions, 0 deletionstools/bpf/bpftool/main.h
- tools/bpf/bpftool/prog.c 4 additions, 2 deletionstools/bpf/bpftool/prog.c
- tools/include/uapi/linux/bpf.h 4 additions, 0 deletionstools/include/uapi/linux/bpf.h
- tools/lib/bpf/libbpf.c 8 additions, 0 deletionstools/lib/bpf/libbpf.c
- tools/testing/selftests/bpf/network_helpers.c 10 additions, 1 deletiontools/testing/selftests/bpf/network_helpers.c
- tools/testing/selftests/bpf/network_helpers.h 1 addition, 0 deletionstools/testing/selftests/bpf/network_helpers.h
- tools/testing/selftests/bpf/prog_tests/connect_force_port.c 79 additions, 28 deletionstools/testing/selftests/bpf/prog_tests/connect_force_port.c
- tools/testing/selftests/bpf/progs/connect_force_port4.c 57 additions, 2 deletionstools/testing/selftests/bpf/progs/connect_force_port4.c
- tools/testing/selftests/bpf/progs/connect_force_port6.c 68 additions, 2 deletionstools/testing/selftests/bpf/progs/connect_force_port6.c
Loading
Please register or sign in to comment