Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: bpf: Less strict size check in sockopt_sk

Originally, the kernel strictly checked the size of the optval in
getsockopt(TCP_ZEROCOPY_RECEIVE) to be equal to sizeof(struct
tcp_zerocopy_receive). With c8856c0514549, this was changed to allow
optvals of different sizes.

The bpf code in the sockopt_sk test was still performing the strict size
check. This fix adapts the kernel behavior from c8856c0514549 in the
selftest, i.e., just check if the required fields are there.

Fixes: 9cacf81f81611 ("bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE")
Signed-off-by: Felix Maurer <fmaurer@redhat.com>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/r/6f569cca2e45473f9a724d54d03fdfb45f29e35f.1643129402.git.fmaurer@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Felix Maurer and committed by
Alexei Starovoitov
fc1ca955 451c4260

+2 -1
+2 -1
tools/testing/selftests/bpf/progs/sockopt_sk.c
··· 72 72 * reasons. 73 73 */ 74 74 75 - if (optval + sizeof(struct tcp_zerocopy_receive) > optval_end) 75 + /* Check that optval contains address (__u64) */ 76 + if (optval + sizeof(__u64) > optval_end) 76 77 return 0; /* bounds check */ 77 78 78 79 if (((struct tcp_zerocopy_receive *)optval)->address != 0)