Re: [PATCH] netfilter: nf_conntrack_sip: fix wrong memory initialisation
From: Gao Feng <hidden>
Date: 2017-03-01 22:56:24
Also in:
netfilter-devel, stable
On Wed, Mar 1, 2017 at 10:33 PM, Christophe Leroy [off-list ref] wrote:
In commit 82de0be6862cd ("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]));Yes, the memset initialization should be changed too. Thanks Feng
quoted hunk ↗ jump to hunk
But as the sip[] table is allocated in the BSS, it is already set to 0 Fixes: 82de0be6862cd ("netfilter: Add helper array register/unregister functions") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy <redacted> --- net/netfilter/nf_conntrack_sip.c | 2 -- 1 file changed, 2 deletions(-)diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 24174c520239..0d17894798b5 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c@@ -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, --2.12.0