diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-03 20:40:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-03 20:40:06 -0800 |
| commit | 20b83643abbc714342f3c52c5c273eeca649d3f9 (patch) | |
| tree | 26db2246f1f73129a932903a564a5246028e00a5 /net/netfilter/nf_conntrack_sip.c | |
| parent | 45115553f32ddbedb1633a6b73751a75a4a4f43a (diff) | |
| parent | 25e94a997b324b5f167f56d56d7106d38b78c9de (diff) | |
| download | linux-20b83643abbc714342f3c52c5c273eeca649d3f9.tar.gz linux-20b83643abbc714342f3c52c5c273eeca649d3f9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree,
they are:
1) Missing check for full sock in ip_route_me_harder(), from
Florian Westphal.
2) Incorrect sip helper structure initilization that breaks it when
several ports are used, from Christophe Leroy.
3) Fix incorrect assumption when looking up for matching with adjacent
intervals in the nft_set_rbtree.
4) Fix broken netlink event error reporting in nf_tables that results
in misleading ESRCH errors propagated to userspace listeners.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_sip.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 2 |
1 files changed, 0 insertions, 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, |