rpms/kernel/F-11 prevent-runtime-conntrack-changes.patch, NONE, 1.1.2.1 kernel.spec, 1.1784.2.14, 1.1784.2.15

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22370

Modified Files:
      Tag: private-fedora-11-2_6_30
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_30
	prevent-runtime-conntrack-changes.patch 
Log Message:
* Wed Feb 03 2010 Kyle McMartin <kyle at redhat.com>
- prevent-runtime-conntrack-changes.patch: fix another conntrack issue
  identified by jcm.


prevent-runtime-conntrack-changes.patch:
 nf_conntrack_core.c   |   15 +++++++++++++++
 nf_conntrack_expect.c |    2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE prevent-runtime-conntrack-changes.patch ---
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 at gmail.com>
Cc: stable at 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)
 {



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1784.2.14
retrieving revision 1.1784.2.15
diff -u -p -r1.1784.2.14 -r1.1784.2.15
--- kernel.spec	3 Feb 2010 20:31:49 -0000	1.1784.2.14
+++ kernel.spec	3 Feb 2010 21:14:30 -0000	1.1784.2.15
@@ -854,6 +854,7 @@ Patch16473: linux-2.6-libertas-crash.pat
 
 # rhbz#533087
 Patch16474: fix-conntrack-bug-with-namespaces.patch
+Patch16475: prevent-runtime-conntrack-changes.patch
 
 # cve-2010-0006
 Patch16500: ipv6-skb_dst-can-be-null-in-ipv6_hop_jumbo.patch
@@ -1634,6 +1635,7 @@ ApplyPatch linux-2.6-libertas-crash.patc
 
 # rhbz#533087
 ApplyPatch fix-conntrack-bug-with-namespaces.patch
+ApplyPatch prevent-runtime-conntrack-changes.patch
 
 # cve-2010-0006
 ApplyPatch ipv6-skb_dst-can-be-null-in-ipv6_hop_jumbo.patch
@@ -2254,6 +2256,10 @@ fi
 
 %changelog
 * Wed Feb 03 2010 Kyle McMartin <kyle at redhat.com>
+- prevent-runtime-conntrack-changes.patch: fix another conntrack issue
+  identified by jcm.
+
+* Wed Feb 03 2010 Kyle McMartin <kyle at redhat.com>
 - fix-conntrack-bug-with-namespaces.patch (rhbz#533087) fix kvm crash.
 
 * Tue Feb 02 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.30.10-105.2.13