Re: [PATCH] selftests/bpf: wq: fix skel leak in serial_test_wq()

[Yonghong Song <yonghong.song@linux.dev>]

On 1/11/26 10:30 AM, Kery Qi wrote:
> serial_test_wq() returns early when ASSERT_OK_PTR(wq_skel, "wq_skel_load")
> fails. In that case wq__open_and_load() may still have returned a non-NULL
> skeleton, and the early return skips wq__destroy(), leaking resources and
> triggering ASAN leak reports in selftests runs.
>
> Jump to the common clean_up label instead, so wq__destroy() is executed on
> all exit paths. Also fix the missing semicolon after 'goto clean_up'.
>
> Fixes: 8290dba51910 ("selftests/bpf: wq: add bpf_wq_start() checks")
> Signed-off-by: Kery Qi <qikeyu2017@gmail.com>
> ---
>   tools/testing/selftests/bpf/prog_tests/wq.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/wq.c b/tools/testing/selftests/bpf/prog_tests/wq.c
> index 1dcdeda84853..b32e22876492 100644
> --- a/tools/testing/selftests/bpf/prog_tests/wq.c
> +++ b/tools/testing/selftests/bpf/prog_tests/wq.c
> @@ -17,11 +17,11 @@ void serial_test_wq(void)
>   
>   	wq_skel = wq__open_and_load();
>   	if (!ASSERT_OK_PTR(wq_skel, "wq_skel_load"))
> -		return;
> +		goto clean_up;

This is not correct. There is no 'clean_up' label in the original code.
Also, there is nothing to clean up if wq__open_and_load() failed.

>   
>   	err = wq__attach(wq_skel);
>   	if (!ASSERT_OK(err, "wq_attach"))
> -		goto clean_up
> +		goto clean_up;
>   
>   	prog_fd = bpf_program__fd(wq_skel->progs.test_syscall_array_sleepable);
>   	err = bpf_prog_test_run_opts(prog_fd, &topts);