| Message ID | 20220824013907.380448-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7e165d1939284d0bf16a83c591c3c5d24a110d0a |
| Headers | show |
| Series | [-next] selftests/bpf: fix wrong size passed to bpf_setsockopt() | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Wed, 24 Aug 2022 09:39:07 +0800 you wrote: > sizeof(new_cc) is not real memory size that new_cc point to, introduce > new_cc_len to store size then pass it to bpf_setsockopt(). > > Fixes: 31123c0360e0 ("selftests/bpf: bpf_setsockopt tests") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > tools/testing/selftests/bpf/progs/setget_sockopt.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Here is the summary with links: - [-next] selftests/bpf: fix wrong size passed to bpf_setsockopt() https://git.kernel.org/bpf/bpf-next/c/6fc2838b148f You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/progs/setget_sockopt.c b/tools/testing/selftests/bpf/progs/setget_sockopt.c index 4a4cb44a4a15..40606ef47a38 100644 --- a/tools/testing/selftests/bpf/progs/setget_sockopt.c +++ b/tools/testing/selftests/bpf/progs/setget_sockopt.c @@ -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;
sizeof(new_cc) is not real memory size that new_cc point to, introduce new_cc_len to store size then pass it to bpf_setsockopt(). Fixes: 31123c0360e0 ("selftests/bpf: bpf_setsockopt tests") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- tools/testing/selftests/bpf/progs/setget_sockopt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)