]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: remove nf_conntrack_helper sysctl and modparam toggles
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 26 Aug 2022 06:49:16 +0000 (08:49 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 31 Aug 2022 10:12:32 +0000 (12:12 +0200)
commit8879449c6f72cdb1991dd93d72c2acc108028c20
treee5b4b13aaf965c1dbe031e047e18d69be848eeab
parent4baaa66260cf55222fa480a9a59c2d937375a038
netfilter: remove nf_conntrack_helper sysctl and modparam toggles

__nf_ct_try_assign_helper() remains in place but it now requires a
template to configure the helper.

A toggle to disable automatic helper assignment was added by:

  7dacd741288a ("netfilter: nf_ct_helper: allow to disable automatic helper assignment")

in 2012 to address the issues described in "Secure use of iptables and
connection tracking helpers". Automatic conntrack helper assignment was
disabled by:

  232ada7c29de ("netfilter: nf_ct_helper: disable automatic helper assignment")

back in 2016.

This patch removes the sysctl and modparam toggles, users now have to
rely on explicit conntrack helper configuration via ruleset.

Update tools/testing/selftests/netfilter/nft_conntrack_helper.sh to
check that auto-assignment does not happen anymore.

Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nf_conntrack.h
include/net/netns/conntrack.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_standalone.c
net/netfilter/nft_ct.c
tools/testing/selftests/netfilter/nft_conntrack_helper.sh