Commit 1abea24a authored by Guo Zhengkui's avatar Guo Zhengkui Committed by Paolo Abeni
Browse files

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: default avatarGuo Zhengkui <guozhengkui@vivo.com>
Link: https://lore.kernel.org/r/20220316092858.9398-1-guozhengkui@vivo.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 58e06d05

tools/testing/selftests/net/cmsg_sender.c

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/udp.h>

#include <sys/socket.h>



#include "../kselftest.h"



enum {

	ERN_SUCCESS = 0,

	/* Well defined errors, callers may depend on these */
@@ -318,7 +320,7 @@ static const char *cs_ts_info2str(unsigned int info) 
		[SCM_TSTAMP_ACK]	= "ACK",

	};



	if (info < sizeof(names) / sizeof(names[0]))

	if (info < ARRAY_SIZE(names))

		return names[info];

	return "unknown";

}

tools/testing/selftests/net/psock_fanout.c

+3 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <unistd.h>



#include "psock_lib.h"

#include "../kselftest.h"



#define RING_NUM_FRAMES			20
@@ -117,7 +118,7 @@ static void sock_fanout_set_cbpf(int fd) 
	struct sock_fprog bpf_prog;



	bpf_prog.filter = bpf_filter;

	bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter);

	bpf_prog.len = ARRAY_SIZE(bpf_filter);



	if (setsockopt(fd, SOL_PACKET, PACKET_FANOUT_DATA, &bpf_prog,

		       sizeof(bpf_prog))) {
@@ -162,7 +163,7 @@ static void sock_fanout_set_ebpf(int fd) 
	memset(&attr, 0, sizeof(attr));

	attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;

	attr.insns = (unsigned long) prog;

	attr.insn_cnt = sizeof(prog) / sizeof(prog[0]);

	attr.insn_cnt = ARRAY_SIZE(prog);

	attr.license = (unsigned long) "GPL";

	attr.log_buf = (unsigned long) log_buf,

	attr.log_size = sizeof(log_buf),

tools/testing/selftests/net/toeplitz.c

+4 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
#include <sys/types.h>

#include <unistd.h>



#include "../kselftest.h"



#define TOEPLITZ_KEY_MIN_LEN	40

#define TOEPLITZ_KEY_MAX_LEN	60
@@ -295,7 +297,7 @@ static void __set_filter(int fd, int off_proto, uint8_t proto, int off_dport) 
	struct sock_fprog prog = {};



	prog.filter = filter;

	prog.len = sizeof(filter) / sizeof(struct sock_filter);

	prog.len = ARRAY_SIZE(filter);

	if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog)))

		error(1, errno, "setsockopt filter");

}
@@ -324,7 +326,7 @@ static void set_filter_null(int fd) 
	struct sock_fprog prog = {};



	prog.filter = filter;

	prog.len = sizeof(filter) / sizeof(struct sock_filter);

	prog.len = ARRAY_SIZE(filter);

	if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog)))

		error(1, errno, "setsockopt filter");

}