From: Alexey Dobriyan <adobriyan@gmail.com>
To: davem@davemloft.net, kaber@trash.net
Cc: jonathan@jonmasters.org, eric.dumazet@gmail.com,
netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: [PATCH for 2.6.33] conntrack: restrict runtime hashsize modifications
Date: Wed, 3 Feb 2010 22:39:29 +0200 [thread overview]
Message-ID: <20100203203929.GA6168@x200> (raw)
Jon Masters correctly points out that conntrack hash sizes
(nf_conntrack_htable_size) are global (not per-netns) and
modifiable at runtime via /sys/module/nf_conntrack/hashsize .
Steps to reproduce:
clone(CLONE_NEWNET)
[grow /sys/module/nf_conntrack/hashsize]
exit()
At netns exit we are going to scan random memory for conntracks to be killed.
Apparently there is a code which deals with hashtable resize for
init_net (and it was there befode netns conntrack code), so prohibit
hashsize modification if there is more than one netns exists.
To change hashtable sizes, you need to reload module.
Expectation hashtable size was simply glued to a variable with no code
to rehash expectations, so it was a bug to allow writing to it.
Make "expect_hashsize" readonly.
This is temporarily until we figure out what to do.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: stable@kernel.org
---
net/netfilter/nf_conntrack_core.c | 15 +++++++++++++++
net/netfilter/nf_conntrack_expect.c | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -21,6 +21,7 @@
#include <linux/stddef.h>
#include <linux/slab.h>
#include <linux/random.h>
+#include <linux/rtnetlink.h>
#include <linux/jhash.h>
#include <linux/err.h>
#include <linux/percpu.h>
@@ -1198,6 +1199,20 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
if (!nf_conntrack_htable_size)
return param_set_uint(val, kp);
+ {
+ struct net *net;
+ unsigned int nr;
+
+ nr = 0;
+ rtnl_lock();
+ for_each_net(net)
+ nr++;
+ rtnl_unlock();
+ /* init_net always exists */
+ if (nr != 1)
+ return -EINVAL;
+ }
+
hashsize = simple_strtoul(val, NULL, 0);
if (!hashsize)
return -EINVAL;
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -569,7 +569,7 @@ static void exp_proc_remove(struct net *net)
#endif /* CONFIG_PROC_FS */
}
-module_param_named(expect_hashsize, nf_ct_expect_hsize, uint, 0600);
+module_param_named(expect_hashsize, nf_ct_expect_hsize, uint, 0400);
int nf_conntrack_expect_init(struct net *net)
{
next reply other threads:[~2010-02-03 20:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-03 20:39 Alexey Dobriyan [this message]
2010-02-03 20:50 ` [PATCH for 2.6.33] conntrack: restrict runtime hashsize modifications Jon Masters
2010-02-04 16:18 ` Patrick McHardy
2010-02-04 16:27 ` Patrick McHardy
2010-02-04 20:18 ` Jon Masters
2010-02-05 10:00 ` Patrick McHardy
2010-02-05 10:14 ` Jon Masters
2010-02-05 10:21 ` Patrick McHardy
2010-02-04 17:04 ` Patrick McHardy
2010-02-04 19:47 ` Alexey Dobriyan
2010-02-04 20:23 ` Jon Masters
2010-02-05 10:00 ` Patrick McHardy
2010-02-05 10:11 ` Jon Masters
2010-02-05 10:19 ` Patrick McHardy
2010-02-05 11:16 ` Patrick McHardy
2010-02-05 11:19 ` Alexey Dobriyan
2010-02-05 11:22 ` Patrick McHardy
2010-02-05 11:25 ` Patrick McHardy
2010-02-05 11:51 ` Jon Masters
2010-02-05 11:23 ` Alexey Dobriyan
2010-02-05 22:04 ` Alexey Dobriyan
2010-02-08 13:34 ` Patrick McHardy
2010-02-08 14:35 ` Patrick McHardy
2010-02-04 20:20 ` Jon Masters
2010-02-05 10:03 ` Patrick McHardy
2010-02-05 10:12 ` Jon Masters
2010-02-05 10:21 ` Patrick McHardy
2010-02-04 17:26 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100203203929.GA6168@x200 \
--to=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=jonathan@jonmasters.org \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).