]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xfrm: snmp: do not use SNMP_MIB_SENTINEL anymore
authorEric Dumazet <edumazet@google.com>
Fri, 5 Sep 2025 16:58:12 +0000 (16:58 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 9 Sep 2025 01:06:21 +0000 (18:06 -0700)
Use ARRAY_SIZE(), so that we know the limit at compile time.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/20250905165813.1470708-9-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/xfrm/xfrm_proc.c

index 8e07dd614b0bbe6ed4679f53b85c04e2aa53453f..5e1fd6b1d503accd8cda72ac43dd6dd0107eccef 100644 (file)
@@ -45,21 +45,21 @@ static const struct snmp_mib xfrm_mib_list[] = {
        SNMP_MIB_ITEM("XfrmInStateDirError", LINUX_MIB_XFRMINSTATEDIRERROR),
        SNMP_MIB_ITEM("XfrmInIptfsError", LINUX_MIB_XFRMINIPTFSERROR),
        SNMP_MIB_ITEM("XfrmOutNoQueueSpace", LINUX_MIB_XFRMOUTNOQSPACE),
-       SNMP_MIB_SENTINEL
 };
 
 static int xfrm_statistics_seq_show(struct seq_file *seq, void *v)
 {
-       unsigned long buff[LINUX_MIB_XFRMMAX];
+       unsigned long buff[ARRAY_SIZE(xfrm_mib_list)];
+       const int cnt = ARRAY_SIZE(xfrm_mib_list);
        struct net *net = seq->private;
        int i;
 
-       memset(buff, 0, sizeof(unsigned long) * LINUX_MIB_XFRMMAX);
+       memset(buff, 0, sizeof(buff));
 
        xfrm_state_update_stats(net);
-       snmp_get_cpu_field_batch(buff, xfrm_mib_list,
-                                net->mib.xfrm_statistics);
-       for (i = 0; xfrm_mib_list[i].name; i++)
+       snmp_get_cpu_field_batch_cnt(buff, xfrm_mib_list, cnt,
+                                    net->mib.xfrm_statistics);
+       for (i = 0; i < cnt; i++)
                seq_printf(seq, "%-24s\t%lu\n", xfrm_mib_list[i].name,
                                                buff[i]);