]> git.baikalelectronics.ru Git - kernel.git/commitdiff
netfilter: nf_defrag_ipv6: allow nf_conntrack_frag6_high_thresh increases
authorEric Dumazet <edumazet@google.com>
Tue, 23 Aug 2022 23:38:48 +0000 (16:38 -0700)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 24 Aug 2022 06:06:44 +0000 (08:06 +0200)
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 c0bfa0c7716c ("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 <edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv6/netfilter/nf_conntrack_reasm.c

index 7dd3629dd19e71a6db2add2265ca49ab9cceaf63..38db0064d6613a8472ec2835afdbf80071c1fcc2 100644 (file)
@@ -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)