Patchwork [nf-next] netfilter: nf_ct_reasm: fix per-netns sysctl initialization

login
register
mail settings
Submitter Michal Kubeček
Date Feb. 13, 2013, 9:46 a.m.
Message ID <20130213094810.64691C3A4E@unicorn.suse.cz>
Download mbox | patch
Permalink /patch/220101/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Michal Kubeček - Feb. 13, 2013, 9:46 a.m.
Adjusting of data pointers in net/netfilter/nf_conntrack_frag6_*
sysctl table for other namespaces points to wrong netns_frags
structure and has reversed order of entries.

Problem introduced by commit c038a767cd69 in 3.7-rc1

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
 net/ipv6/netfilter/nf_conntrack_reasm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Pablo Neira - Feb. 13, 2013, 7:49 p.m.
On Wed, Feb 13, 2013 at 10:46:09AM +0100, Michal Kubecek wrote:
> Adjusting of data pointers in net/netfilter/nf_conntrack_frag6_*
> sysctl table for other namespaces points to wrong netns_frags
> structure and has reversed order of entries.
> 
> Problem introduced by commit c038a767cd69 in 3.7-rc1

Applied, thanks Michal.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index c674f15..6f5c986 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -97,9 +97,9 @@  static int nf_ct_frag6_sysctl_register(struct net *net)
 		if (table == NULL)
 			goto err_alloc;
 
-		table[0].data = &net->ipv6.frags.high_thresh;
-		table[1].data = &net->ipv6.frags.low_thresh;
-		table[2].data = &net->ipv6.frags.timeout;
+		table[0].data = &net->nf_frag.frags.timeout;
+		table[1].data = &net->nf_frag.frags.low_thresh;
+		table[2].data = &net->nf_frag.frags.high_thresh;
 	}
 
 	hdr = register_net_sysctl(net, "net/netfilter", table);