]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
netfilter: nf_conntrack: use hlist_add_head_rcu() in nf_conntrack_set_hashsize()
authorEric Dumazet <dada1@cosmosbay.com>
Wed, 25 Mar 2009 16:24:34 +0000 (17:24 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 25 Mar 2009 16:24:34 +0000 (17:24 +0100)
Using hlist_add_head() in nf_conntrack_set_hashsize() is quite dangerous.
Without any barrier, one CPU could see a loop while doing its lookup.
Its true new table cannot be seen by another cpu, but previous table is still
readable.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_core.c

index 55befe59e1c038c01abe63ebc2b1e5d00a84a886..54e983f13898740a0f369a5f66cd3b80e69a2fd4 100644 (file)
@@ -1121,7 +1121,7 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
                                        struct nf_conntrack_tuple_hash, hnode);
                        hlist_del_rcu(&h->hnode);
                        bucket = __hash_conntrack(&h->tuple, hashsize, rnd);
-                       hlist_add_head(&h->hnode, &hash[bucket]);
+                       hlist_add_head_rcu(&h->hnode, &hash[bucket]);
                }
        }
        old_size = nf_conntrack_htable_size;