Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: net: fix array_size.cocci warning

Fix array_size.cocci warning in tools/testing/selftests/net.

Use `ARRAY_SIZE(arr)` instead of forms like `sizeof(arr)/sizeof(arr[0])`.

It has been tested with gcc (Debian 8.3.0-6) 8.3.0.

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
Link: https://lore.kernel.org/r/20220316092858.9398-1-guozhengkui@vivo.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Guo Zhengkui and committed by
Paolo Abeni
1abea24a 58e06d05

+10 -5
+3 -1
tools/testing/selftests/net/cmsg_sender.c
··· 16 16 #include <linux/udp.h> 17 17 #include <sys/socket.h> 18 18 19 + #include "../kselftest.h" 20 + 19 21 enum { 20 22 ERN_SUCCESS = 0, 21 23 /* Well defined errors, callers may depend on these */ ··· 320 318 [SCM_TSTAMP_ACK] = "ACK", 321 319 }; 322 320 323 - if (info < sizeof(names) / sizeof(names[0])) 321 + if (info < ARRAY_SIZE(names)) 324 322 return names[info]; 325 323 return "unknown"; 326 324 }
+3 -2
tools/testing/selftests/net/psock_fanout.c
··· 53 53 #include <unistd.h> 54 54 55 55 #include "psock_lib.h" 56 + #include "../kselftest.h" 56 57 57 58 #define RING_NUM_FRAMES 20 58 59 ··· 118 117 struct sock_fprog bpf_prog; 119 118 120 119 bpf_prog.filter = bpf_filter; 121 - bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter); 120 + bpf_prog.len = ARRAY_SIZE(bpf_filter); 122 121 123 122 if (setsockopt(fd, SOL_PACKET, PACKET_FANOUT_DATA, &bpf_prog, 124 123 sizeof(bpf_prog))) { ··· 163 162 memset(&attr, 0, sizeof(attr)); 164 163 attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER; 165 164 attr.insns = (unsigned long) prog; 166 - attr.insn_cnt = sizeof(prog) / sizeof(prog[0]); 165 + attr.insn_cnt = ARRAY_SIZE(prog); 167 166 attr.license = (unsigned long) "GPL"; 168 167 attr.log_buf = (unsigned long) log_buf, 169 168 attr.log_size = sizeof(log_buf),
+4 -2
tools/testing/selftests/net/toeplitz.c
··· 52 52 #include <sys/types.h> 53 53 #include <unistd.h> 54 54 55 + #include "../kselftest.h" 56 + 55 57 #define TOEPLITZ_KEY_MIN_LEN 40 56 58 #define TOEPLITZ_KEY_MAX_LEN 60 57 59 ··· 297 295 struct sock_fprog prog = {}; 298 296 299 297 prog.filter = filter; 300 - prog.len = sizeof(filter) / sizeof(struct sock_filter); 298 + prog.len = ARRAY_SIZE(filter); 301 299 if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) 302 300 error(1, errno, "setsockopt filter"); 303 301 } ··· 326 324 struct sock_fprog prog = {}; 327 325 328 326 prog.filter = filter; 329 - prog.len = sizeof(filter) / sizeof(struct sock_filter); 327 + prog.len = ARRAY_SIZE(filter); 330 328 if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) 331 329 error(1, errno, "setsockopt filter"); 332 330 }