netfilter: nf_conntrack: don't send destroy events from iterator

Let nf_ct_delete handle delivery of the DESTROY event.

Based on earlier patch from Pablo Neira.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

5 files changed, 11 insertions, 39 deletions

diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index 30e4de940567..00352ce0f0de 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -118,7 +118,7 @@ static int masq_device_event(struct notifier_block *this,
                 NF_CT_ASSERT(dev->ifindex != 0);
 
                 nf_ct_iterate_cleanup(net, device_cmp,
-                                      (void *)(long)dev->ifindex);
+                                      (void *)(long)dev->ifindex, 0, 0);
         }
 
         return NOTIFY_DONE;
diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c
index 47bff6107519..3e4e92d5e157 100644
--- a/net/ipv6/netfilter/ip6t_MASQUERADE.c
+++ b/net/ipv6/netfilter/ip6t_MASQUERADE.c
@@ -76,7 +76,7 @@ static int masq_device_event(struct notifier_block *this,
 
         if (event == NETDEV_DOWN)
                 nf_ct_iterate_cleanup(net, device_cmp,
-                                      (void *)(long)dev->ifindex);
+                                      (void *)(long)dev->ifindex, 0, 0);
 
         return NOTIFY_DONE;
 }
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 0934611ff9f3..da6f1787a102 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1246,7 +1246,7 @@ found:
 
 void nf_ct_iterate_cleanup(struct net *net,
                            int (*iter)(struct nf_conn *i, void *data),
-                           void *data)
+                           void *data, u32 portid, int report)
 {
         struct nf_conn *ct;
         unsigned int bucket = 0;
@@ -1254,7 +1254,7 @@ void nf_ct_iterate_cleanup(struct net *net,
         while ((ct = get_next_corpse(net, iter, data, &bucket)) != NULL) {
                 /* Time to push up daises... */
                 if (del_timer(&ct->timeout))
-                        death_by_timeout((unsigned long)ct);
+                        nf_ct_delete(ct, portid, report);
 
                 /* ... else the timer will get him soon. */
 
@@ -1263,30 +1263,6 @@ void nf_ct_iterate_cleanup(struct net *net,
 }
 EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup);
 
-struct __nf_ct_flush_report {
-        u32 portid;
-        int report;
-};
-
-static int kill_report(struct nf_conn *i, void *data)
-{
-        struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data;
-        struct nf_conn_tstamp *tstamp;
-
-        tstamp = nf_conn_tstamp_find(i);
-        if (tstamp && tstamp->stop == 0)
-                tstamp->stop = ktime_to_ns(ktime_get_real());
-
-        /* If we fail to deliver the event, death_by_timeout() will retry */
-        if (nf_conntrack_event_report(IPCT_DESTROY, i,
-                                      fr->portid, fr->report) < 0)
-                return 1;
-
-        /* Avoid the delivery of the destroy event in death_by_timeout(). */
-        set_bit(IPS_DYING_BIT, &i->status);
-        return 1;
-}
-
 static int kill_all(struct nf_conn *i, void *data)
 {
         return 1;
@@ -1304,11 +1280,7 @@ EXPORT_SYMBOL_GPL(nf_ct_free_hashtable);
 
 void nf_conntrack_flush_report(struct net *net, u32 portid, int report)
 {
-        struct __nf_ct_flush_report fr = {
-                .portid = portid,
-                .report = report,
-        };
-        nf_ct_iterate_cleanup(net, kill_report, &fr);
+        nf_ct_iterate_cleanup(net, kill_all, NULL, portid, report);
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_flush_report);
 
@@ -1389,7 +1361,7 @@ void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list)
 i_see_dead_people:
         busy = 0;
         list_for_each_entry(net, net_exit_list, exit_list) {
-                nf_ct_iterate_cleanup(net, kill_all, NULL);
+                nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0);
                 nf_ct_release_dying_list(net);
                 if (atomic_read(&net->ct.count) != 0)
                         busy = 1;
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 0ab9636ac57e..ce3004156eeb 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -281,7 +281,7 @@ void nf_ct_l3proto_pernet_unregister(struct net *net,
         nf_ct_l3proto_unregister_sysctl(net, proto);
 
         /* Remove all contrack entries for this protocol */
-        nf_ct_iterate_cleanup(net, kill_l3proto, proto);
+        nf_ct_iterate_cleanup(net, kill_l3proto, proto, 0, 0);
 }
 EXPORT_SYMBOL_GPL(nf_ct_l3proto_pernet_unregister);
 
@@ -476,7 +476,7 @@ void nf_ct_l4proto_pernet_unregister(struct net *net,
         nf_ct_l4proto_unregister_sysctl(net, pn, l4proto);
 
         /* Remove all contrack entries for this protocol */
-        nf_ct_iterate_cleanup(net, kill_l4proto, l4proto);
+        nf_ct_iterate_cleanup(net, kill_l4proto, l4proto, 0, 0);
 }
 EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister);
 
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 038eee5c8f85..6ff808375b5e 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -497,7 +497,7 @@ static void nf_nat_l4proto_clean(u8 l3proto, u8 l4proto)
 
         rtnl_lock();
         for_each_net(net)
-                nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean);
+                nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean, 0, 0);
         rtnl_unlock();
 }
 
@@ -511,7 +511,7 @@ static void nf_nat_l3proto_clean(u8 l3proto)
         rtnl_lock();
 
         for_each_net(net)
-                nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean);
+                nf_ct_iterate_cleanup(net, nf_nat_proto_remove, &clean, 0, 0);
         rtnl_unlock();
 }
 
@@ -749,7 +749,7 @@ static void __net_exit nf_nat_net_exit(struct net *net)
 {
         struct nf_nat_proto_clean clean = {};
 
-        nf_ct_iterate_cleanup(net, &nf_nat_proto_remove, &clean);
+        nf_ct_iterate_cleanup(net, &nf_nat_proto_remove, &clean, 0, 0);
         synchronize_rcu();
         nf_ct_free_hashtable(net->ct.nat_bysource, net->ct.nat_htable_size);
 }