]> git.baikalelectronics.ru Git - kernel.git/commitdiff
netfilter: nf_conntrack_sip: fix wrong memory initialisation
authorChristophe Leroy <christophe.leroy@c-s.fr>
Wed, 1 Mar 2017 14:33:26 +0000 (15:33 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 3 Mar 2017 12:48:31 +0000 (13:48 +0100)
In commit f1bbf7d29f4d7 ("netfilter: Add helper array
register/unregister functions"),
struct nf_conntrack_helper sip[MAX_PORTS][4] was changed to
sip[MAX_PORTS * 4], so the memory init should have been changed to
memset(&sip[4 * i], 0, 4 * sizeof(sip[i]));

But as the sip[] table is allocated in the BSS, it is already set to 0

Fixes: f1bbf7d29f4d7 ("netfilter: Add helper array register/unregister functions")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_sip.c

index 24174c5202398fa28287db69b570a12db15c1771..0d17894798b5caea7540b3bf7d341a0a2f623fd6 100644 (file)
@@ -1628,8 +1628,6 @@ static int __init nf_conntrack_sip_init(void)
                ports[ports_c++] = SIP_PORT;
 
        for (i = 0; i < ports_c; i++) {
-               memset(&sip[i], 0, sizeof(sip[i]));
-
                nf_ct_helper_init(&sip[4 * i], AF_INET, IPPROTO_UDP, "sip",
                                  SIP_PORT, ports[i], i, sip_exp_policy,
                                  SIP_EXPECT_MAX,