Commit 7e165d19 authored by Yang Yingliang's avatar Yang Yingliang Committed by Alexei Starovoitov
Browse files

selftests/bpf: Fix wrong size passed to bpf_setsockopt() 



sizeof(new_cc) is not real memory size that new_cc points to; introduce
a new_cc_len to store the size and then pass it to bpf_setsockopt().

Fixes: 31123c03 ("selftests/bpf: bpf_setsockopt tests")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220824013907.380448-1-yangyingliang@huawei.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent b03914f7

tools/testing/selftests/bpf/progs/setget_sockopt.c

+7 −3
Original line number Diff line number Diff line
@@ -305,15 +305,19 @@ static int bpf_test_tcp_sockopt(__u32 i, struct loop_ctx *lc) 
	if (t->opt == TCP_CONGESTION) {

		char old_cc[16], tmp_cc[16];

		const char *new_cc;

		int new_cc_len;



		if (bpf_getsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, old_cc, sizeof(old_cc)))

			return 1;

		if (!bpf_strncmp(old_cc, sizeof(old_cc), cubic_cc))

		if (!bpf_strncmp(old_cc, sizeof(old_cc), cubic_cc)) {

			new_cc = reno_cc;

		else

			new_cc_len = sizeof(reno_cc);

		} else {

			new_cc = cubic_cc;

			new_cc_len = sizeof(cubic_cc);

		}

		if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, (void *)new_cc,

				   sizeof(new_cc)))

				   new_cc_len))

			return 1;

		if (bpf_getsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, tmp_cc, sizeof(tmp_cc)))

			return 1;