Skip to content

Commit 00cd7bf

Browse files
edumazetummakynes
authored andcommitted
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 8361962 ("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: Eric Dumazet <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 9afb4b2 commit 00cd7bf

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

net/ipv6/netfilter/nf_conntrack_reasm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
8686
table[1].extra2 = &nf_frag->fqdir->high_thresh;
8787
table[2].data = &nf_frag->fqdir->high_thresh;
8888
table[2].extra1 = &nf_frag->fqdir->low_thresh;
89-
table[2].extra2 = &nf_frag->fqdir->high_thresh;
9089

9190
hdr = register_net_sysctl(net, "net/netfilter", table);
9291
if (hdr == NULL)

0 commit comments

Comments
 (0)