Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee254fa4 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: netns fix re reliable conntrack event delivery 



Conntracks in netns other than init_net dying list were never killed.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 1e66dafc

net/netfilter/nf_conntrack_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1089,14 +1089,14 @@ void nf_conntrack_flush_report(struct net *net, u32 pid, int report) 
}

EXPORT_SYMBOL_GPL(nf_conntrack_flush_report);



static void nf_ct_release_dying_list(void)

static void nf_ct_release_dying_list(struct net *net)

{

	struct nf_conntrack_tuple_hash *h;

	struct nf_conn *ct;

	struct hlist_nulls_node *n;



	spin_lock_bh(&nf_conntrack_lock);

	hlist_nulls_for_each_entry(h, n, &init_net.ct.dying, hnnode) {

	hlist_nulls_for_each_entry(h, n, &net->ct.dying, hnnode) {

		ct = nf_ct_tuplehash_to_ctrack(h);

		/* never fails to remove them, no listeners at this point */

		nf_ct_kill(ct);
@@ -1115,7 +1115,7 @@ static void nf_conntrack_cleanup_net(struct net *net) 
{

 i_see_dead_people:

	nf_ct_iterate_cleanup(net, kill_all, NULL);

	nf_ct_release_dying_list();

	nf_ct_release_dying_list(net);

	if (atomic_read(&net->ct.count) != 0) {

		schedule();

		goto i_see_dead_people;