Commit 95a8d19f authored Aug 25, 2016 by Florian Westphal Committed by Pablo Neira Ayuso Aug 30, 2016

netfilter: restart search if moved to other chain



In case nf_conntrack_tuple_taken did not find a conflicting entry
check that all entries in this hash slot were tested and restart
in case an entry was moved to another chain.

Reported-by: Eric Dumazet <edumazet@google.com>
Fixes: ea781f19 ("netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and get rid of call_rcu()")
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 7073b16f

net/netfilter/nf_conntrack_core.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -809,6 +809,7 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,
		zone = nf_ct_zone(ignored_conntrack);

		rcu_read_lock();
		begin:
		nf_conntrack_get_ht(&ct_hash, &hsize);
		hash = __hash_conntrack(net, tuple, hsize);

		@@ -822,6 +823,12 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,
		}
		NF_CT_STAT_INC_ATOMIC(net, searched);
		}

		if (get_nulls_value(n) != hash) {
		NF_CT_STAT_INC_ATOMIC(net, search_restart);
		goto begin;
		}

		rcu_read_unlock();

		return 0;