Commit 00cd7bf9 authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_defrag_ipv6: allow nf_conntrack_frag6_high_thresh increases 



Currently, net.netfilter.nf_conntrack_frag6_high_thresh can only be lowered.

I found this issue while investigating a probable kernel issue
causing flakes in tools/testing/selftests/net/ip_defrag.sh

In particular, these sysctl changes were ignored:
	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_high_thresh=9000000 >/dev/null 2>&1
	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_low_thresh=7000000  >/dev/null 2>&1

This change is inline with commit 83619623 ("net/ipfrag: let ip[6]frag_high_thresh
in ns be higher than in init_net")

Fixes: 8db3d41569bb ("netfilter: nf_defrag_ipv6: use net_generic infra")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 9afb4b27

net/ipv6/netfilter/nf_conntrack_reasm.c

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static int nf_ct_frag6_sysctl_register(struct net *net) 
	table[1].extra2	= &nf_frag->fqdir->high_thresh;

	table[2].data	= &nf_frag->fqdir->high_thresh;

	table[2].extra1	= &nf_frag->fqdir->low_thresh;

	table[2].extra2	= &nf_frag->fqdir->high_thresh;



	hdr = register_net_sysctl(net, "net/netfilter", table);

	if (hdr == NULL)