selftests/bpf: Fix incorrect array size calculation
Subsystems (3)
PATCH v2 1/1 selftests/bpf: Fix incorrect array size calculation
The loop in bench_sockmap_prog_destroy() has two issues:
1. Using 'sizeof(ctx.fds)' as the loop bound results in the number of bytes, not the number of file descriptors, causing the loop to iterate far more times than intended.
2. The condition 'ctx.fds[0] > 0' incorrectly checks only the first fd for all iterations, potentially leaving file descriptors unclosed. Change it to 'ctx.fds[i] > 0' to check each fd properly.
These fixes ensure correct cleanup of all file descriptors when the benchmark exits.
--- tools/testing/selftests/bpf/benchs/bench_sockmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/benchs/bench_sockmap.c +3 -2
@@ -10,6 +10,7 @@#include <argp.h> #include "bench.h" #include "bench_sockmap_prog.skel.h" +#include "bpf_util.h" #define FILE_SIZE (128 * 1024)#define DATA_REPEAT_SIZE 10
@@ -124,8 +125,8 @@ static void bench_sockmap_prog_destroy(void) {int i; -for (i =0 ; i <sizeof (ctx.fds); i++) { -if (ctx.fds[0 ] >0 ) +for (i =0 ; i <ARRAY_SIZE (ctx.fds); i++) { +if (ctx.fds[i] >0 )close (ctx.fds[i]); }
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 11 lines · On Tue, 9 Sep 2025 20:47:04 +0800 you wrote:
The loop in
bench_sockmap_prog_destroy()has two issues:1. Using 'sizeof(ctx.fds)' as the loop bound results in the number of bytes, not the number of file descriptors, causing the loop to iterate far more times than intended.
2. The condition 'ctx.fds[0] > 0' incorrectly checks only the first fd for all iterations, potentially leaving file descriptors unclosed. Change it to 'ctx.fds[i] > 0' to check each fd properly.
[...]
Here is the summary with links:
- [bpf-next,v2] selftests/bpf: Fix incorrect array size calculation
https://git.kernel.org/bpf/bpf-next/c/f85981327a90
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html