Skip to contentSkip to conversation

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

PATCH In review Kery Qi 2 participants 2 messages Jan 11 – Jan 12

Subsystems (3)
lore
Share & tools
lore

Kery Qi

author
#0 lore raw

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

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")
---
 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
index 1dcdeda84853..b32e22876492 100644
@@ -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
reviewer
#1 lore raw
Quoted 19 lines · Kery Qi

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")
---
  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
index 1dcdeda84853..b32e22876492 100644

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 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.

Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/wq.c +1 -1
  	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);