netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nf-next] netfilter: nf_ct_reasm: fix per-netns sysctl initialization
@ 2013-02-13  9:46 Michal Kubecek
  2013-02-13 19:49 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Michal Kubecek @ 2013-02-13  9:46 UTC (permalink / raw)
  To: Pablo Neira Ayuso
  Cc: Patrick McHardy, netfilter-devel, coreteam, netdev, linux-kernel,
	Amerigo Wang

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(-)

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);
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH nf-next] netfilter: nf_ct_reasm: fix per-netns sysctl initialization
  2013-02-13  9:46 [PATCH nf-next] netfilter: nf_ct_reasm: fix per-netns sysctl initialization Michal Kubecek
@ 2013-02-13 19:49 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-02-13 19:49 UTC (permalink / raw)
  To: Michal Kubecek
  Cc: Patrick McHardy, netfilter-devel, coreteam, netdev, linux-kernel,
	Amerigo Wang

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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-02-13 19:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-13  9:46 [PATCH nf-next] netfilter: nf_ct_reasm: fix per-netns sysctl initialization Michal Kubecek
2013-02-13 19:49 ` Pablo Neira Ayuso

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).