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

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

[Kery Qi]

When wq__attach() fails, serial_test_wq() returns early without calling
wq__destroy(), leaking the skeleton resources allocated by
wq__open_and_load().

Fix this by jumping to a common clean_up label that calls wq__destroy()
on all exit paths after successful open_and_load.

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;
 
 	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);
-- 
2.34.1

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

[Yonghong Song]

On 1/20/26 1:12 AM, Kery Qi wrote:
> When wq__attach() fails, serial_test_wq() returns early without calling
> wq__destroy(), leaking the skeleton resources allocated by
> wq__open_and_load().
>
> Fix this by jumping to a common clean_up label that calls wq__destroy()
> on all exit paths after successful open_and_load.
>
> 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 incorrect. Just doing 'return' is correct. Probably
rename "wq_skel_load" to "wq__open_and_load".

>   
>   	err = wq__attach(wq_skel);
>   	if (!ASSERT_OK(err, "wq_attach"))
> -		goto clean_up
> +		goto clean_up;

Your patch is not on top of latest bpf-next.

>   
>   	prog_fd = bpf_program__fd(wq_skel->progs.test_syscall_array_sleepable);
>   	err = bpf_prog_test_run_opts(prog_fd, &topts);

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

[齐柯宇]

Hi,

Thank you for the review.

You are right. Modifying the error path for wq__open_and_load() was
incorrect. My intention was solely to fix the resource leak when
wq__attach() fails.

I will drop the incorrect change to wq__open_and_load(), rebase my
work on the latest bpf-next tree, and send a v2 patch shortly.

Thanks,

Kery Qi

Yonghong Song <yonghong.song@linux.dev> 于2026年1月20日周二 23:48写道：
>
>
>
> On 1/20/26 1:12 AM, Kery Qi wrote:
> > When wq__attach() fails, serial_test_wq() returns early without calling
> > wq__destroy(), leaking the skeleton resources allocated by
> > wq__open_and_load().
> >
> > Fix this by jumping to a common clean_up label that calls wq__destroy()
> > on all exit paths after successful open_and_load.
> >
> > 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 incorrect. Just doing 'return' is correct. Probably
> rename "wq_skel_load" to "wq__open_and_load".
>
> >
> >       err = wq__attach(wq_skel);
> >       if (!ASSERT_OK(err, "wq_attach"))
> > -             goto clean_up
> > +             goto clean_up;
>
> Your patch is not on top of latest bpf-next.
>
> >
> >       prog_fd = bpf_program__fd(wq_skel->progs.test_syscall_array_sleepable);
> >       err = bpf_prog_test_run_opts(prog_fd, &topts);
>