diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-02-08 11:18:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-08 11:18:07 -0800 |
| commit | d696c7bdaa55e2208e56c6f98e6bc1599f34286d (patch) | |
| tree | 628782197c21b1e8611a41914865cdba586a1c65 /include/net | |
| parent | 14c7dbe043d01a83a30633ab6b109ba2ac61d9f7 (diff) | |
| download | linux-3.10-d696c7bdaa55e2208e56c6f98e6bc1599f34286d.tar.gz linux-3.10-d696c7bdaa55e2208e56c6f98e6bc1599f34286d.tar.bz2 linux-3.10-d696c7bdaa55e2208e56c6f98e6bc1599f34286d.zip | |
netfilter: nf_conntrack: fix hash resizing with namespaces
As noticed by Jon Masters <jonathan@jonmasters.org>, the conntrack hash
size is global and not per namespace, but modifiable at runtime through
/sys/module/nf_conntrack/hashsize. Changing the hash size will only
resize the hash in the current namespace however, so other namespaces
will use an invalid hash size. This can cause crashes when enlarging
the hashsize, or false negative lookups when shrinking it.
Move the hash size into the per-namespace data and only use the global
hash size to initialize the per-namespace value when instanciating a
new namespace. Additionally restrict hash resizing to init_net for
now as other namespaces are not handled currently.
Cc: stable@kernel.org
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netns/conntrack.h | 1 | ||||
| -rw-r--r-- | include/net/netns/ipv4.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index aed23b6c847..63d449807d9 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -11,6 +11,7 @@ struct nf_conntrack_ecache; struct netns_ct { atomic_t count; unsigned int expect_count; + unsigned int htable_size; struct kmem_cache *nf_conntrack_cachep; struct hlist_nulls_head *hash; struct hlist_head *expect_hash; diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 2eb3814d625..9a4b8b71407 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -40,6 +40,7 @@ struct netns_ipv4 { struct xt_table *iptable_security; struct xt_table *nat_table; struct hlist_head *nat_bysource; + unsigned int nat_htable_size; int nat_vmalloced; #endif |