selftests/bpf: wq: fix skel leak in serial_test_wq()
Subsystems (3)
PATCH 1/1 selftests/bpf: wq: fix skel leak in serial_test_wq()
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.
--- tools/testing/selftests/bpf/prog_tests/wq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/wq.c +2 -2
@@ -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);
Signature · 1 line
2.34.1
Yonghong Song
reviewerQuoted 18 lines · Kery Qi
When
wq__attach()fails,serial_test_wq()returns early without callingwq__destroy(), leaking the skeleton resources allocated bywq__open_and_load().Fix this by jumping to a common
clean_uplabel that callswq__destroy()on all exit paths after successfulopen_and_load.Fixes 8290dba51910 ("selftests/bpf: wq: add bpf_wq_start() checks")Signed-off-by Kery Qi <[email protected]>--- tools/testing/selftests/bpf/prog_tests/wq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/prog_tests/wq.c +0
-0
tools/testing/selftests/bpf/prog_tests/wq.c void serial_test_wq(void) · line 20
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/wq.c +1
-1@@ -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".
tools/testing/selftests/bpf/prog_tests/wq.c void serial_test_wq(void) · line 24
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/wq.c +1
-1err =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.
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/wq.c +0
-0prog_fd =bpf_program__fd (wq_skel->progs.test_syscall_array_sleepable); err =bpf_prog_test_run_opts (prog_fd, &topts);
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
Quoted 43 lines · Yonghong Song <[email protected]> 于2026年1月20日周二 23:48写道:
Quoted 18 lines · Kery Qi
When
wq__attach()fails,serial_test_wq()returns early without callingwq__destroy(), leaking the skeleton resources allocated bywq__open_and_load().Fix this by jumping to a common
clean_uplabel that callswq__destroy()on all exit paths after successfulopen_and_load.Fixes 8290dba51910 ("selftests/bpf: wq: add bpf_wq_start() checks")Signed-off-by Kery Qi <[email protected]>--- tools/testing/selftests/bpf/prog_tests/wq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/prog_tests/wq.c +0
-0tools/testing/selftests/bpf/prog_tests/wq.c void serial_test_wq(void) · line 20
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/wq.c +1
-1@@ -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".tools/testing/selftests/bpf/prog_tests/wq.c void serial_test_wq(void) · line 24
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/wq.c +1
-1err =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.
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/wq.c +0
-0prog_fd =bpf_program__fd (wq_skel->progs.test_syscall_array_sleepable); err =bpf_prog_test_run_opts (prog_fd, &topts);