Skip to contentSkip to conversation

selftests/bpf: close the file descriptor to avoid resource leaks

PATCH In review Malaya Kumar Rout 2 participants 2 messages Apr 12, 2025 – Apr 15, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/bpf: close the file descriptor to avoid resource leaks

Static analysis found an issue in bench_htab_mem.c and sk_assign.c

cppcheck output before this patch:
tools/testing/selftests/bpf/benchs/bench_htab_mem.c:284:3: error: Resource leak: fd [resourceLeak] tools/testing/selftests/bpf/prog_tests/sk_assign.c:41:3: error: Resource leak: tc [resourceLeak]

cppcheck output after this patch:
No resource leaks found

Fix the issue by closing the file descriptors fd and tc.

---
 tools/testing/selftests/bpf/benchs/bench_htab_mem.c | 3 +--
 tools/testing/selftests/bpf/prog_tests/sk_assign.c  | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/benchs/bench_htab_mem.c +1 -2
index 926ee822143e..297e32390cd1 100644
@@ -279,6 +279,7 @@ static void htab_mem_read_mem_cgrp_file(const char *name, unsigned long *value)
 	}
 
 	got = read(fd, buf, sizeof(buf) - 1);
+	close(fd);
 	if (got <= 0) {
 		*value = 0;
 		return;
@@ -286,8 +287,6 @@ static void htab_mem_read_mem_cgrp_file(const char *name, unsigned long *value)
 	buf[got] = 0;
 
 	*value = strtoull(buf, NULL, 0);
-
-	close(fd);
 }
 
 static void htab_mem_measure(struct bench_res *res)
tools/testing/selftests/bpf/prog_tests/sk_assign.c +3 -1
index 0b9bd1d6f7cc..05cf66265cf1 100644
@@ -37,8 +37,10 @@ configure_stack(void)
 	tc = popen("tc -V", "r");
 	if (CHECK_FAIL(!tc))
 		return false;
-	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc)))
+	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc))) {
+		close(tc);
 		return false;
+	}
 	if (strstr(tc_version, ", libbpf "))
 		prog = "test_sk_assign_libbpf.bpf.o";
 	else
Signature · 1 line
2.43.0
#1 lore raw

tools/testing/selftests/bpf/prog_tests/sk_assign.c configure_stack(void) · line 41

Quoted 11 lines · Malaya Kumar Rout
tools/testing/selftests/bpf/prog_tests/sk_assign.c +2 -1
index 0b9bd1d6f7cc..05cf66265cf1 100644
@@ -37,8 +37,10 @@ configure_stack(void)
  	tc = popen("tc -V", "r");
  	if (CHECK_FAIL(!tc))
  		return false;
-	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc)))
+	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc))) {
+		close(tc);

It is not even compiler tested.

pw-bot: cr

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/sk_assign.c +1 -0
  		return false;
+	}
  	if (strstr(tc_version, ", libbpf "))
  		prog = "test_sk_assign_libbpf.bpf.o";
  	else