netfilter: conntrack: protect early_drop by rcu read lock

User can add ct entry via nfnetlink(IPCTNL_MSG_CT_NEW), and if the total
number reach the nf_conntrack_max, we will try to drop some ct entries.

But in this case(the main function call path is ctnetlink_create_conntrack
-> nf_conntrack_alloc -> early_drop), rcu_read_lock is not held, so race
with hash resize will happen.

Fixes: 242922a02717 ("netfilter: conntrack: simplify early_drop")
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index e0e9c9a0f5ba323a1346849a6d6c82df6b87985b..2d46225501c1b004e6fcab7f613fa5968d2fba3f 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -880,6 +880,7 @@ static noinline int early_drop(struct net *net, unsigned int _hash)
                struct hlist_nulls_head *ct_hash;
                unsigned hash, sequence, drops;
 
+               rcu_read_lock();
                do {
                        sequence = read_seqcount_begin(&nf_conntrack_generation);
                        hash = scale_hash(_hash++);
@@ -887,6 +888,8 @@ static noinline int early_drop(struct net *net, unsigned int _hash)
                } while (read_seqcount_retry(&nf_conntrack_generation, sequence));
 
                drops = early_drop_list(net, &ct_hash[hash]);
+               rcu_read_unlock();
+
                if (drops) {
                        NF_CT_STAT_ADD_ATOMIC(net, early_drop, drops);
                        return true;