Re: [PATCH bpf 1/2] selftests/bpf: test_progs: don't leak server_fd in tcp_rtt
From: Andrii Nakryiko
Date: Tue Oct 01 2019 - 23:18:38 EST
On Tue, Oct 1, 2019 at 10:39 AM Brian Vazquez <brianvv@xxxxxxxxxx> wrote:
>
> server_fd needs to be closed if pthread can't be created.
>
> Fixes: 8a03222f508b ("selftests/bpf: test_progs: fix client/server race
> in tcp_rtt")
Fixes tag hast to be on single line, no wrapping. Besides that:
Acked-by: Andrii Nakryiko <andriin@xxxxxx>
> Cc: Stanislav Fomichev <sdf@xxxxxxxxxx>
>
> Signed-off-by: Brian Vazquez <brianvv@xxxxxxxxxx>
> ---
> tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
> index a82da555b1b02..f4cd60d6fba2e 100644
> --- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
> +++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
> @@ -260,13 +260,14 @@ void test_tcp_rtt(void)
>
> if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
> (void *)&server_fd)))
> - goto close_cgroup_fd;
> + goto close_server_fd;
>
> pthread_mutex_lock(&server_started_mtx);
> pthread_cond_wait(&server_started, &server_started_mtx);
> pthread_mutex_unlock(&server_started_mtx);
>
> CHECK_FAIL(run_test(cgroup_fd, server_fd));
> +close_server_fd:
> close(server_fd);
> close_cgroup_fd:
> close(cgroup_fd);
> --
> 2.23.0.444.g18eeb5a265-goog
>