Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Pass conntrack -f to specify family in netfilter conntrack helper selftests, from Chen Yi.
2) Honor hashsize modparam from nf_conntrack_buckets sysctl, from Jesper D. Brouer.
3) Fix memleak in nf_nat_init() error path, from Dinghao Liu.
Chen Yi (1):
selftests: netfilter: Pass family parameter "-f" to conntrack tool
Dinghao Liu (1):
netfilter: nf_nat: Fix memleak in nf_nat_init
Jesper Dangaard Brouer (1):
netfilter: conntrack: fix reading nf_conntrack_buckets
net/netfilter/nf_conntrack_standalone.c | 3 +++ net/netfilter/nf_nat_core.c | 1 + .../selftests/netfilter/nft_conntrack_helper.sh | 12 +++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-)
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit c49243e8898233de18edfaaa5b7b261ea457f221:
Merge branch 'net-fix-issues-around-register_netdevice-failures' (2021-01-08 19:27:44 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 869f4fdaf4ca7bb6e0d05caf6fa1108dddc346a7:
netfilter: nf_nat: Fix memleak in nf_nat_init (2021-01-11 00:34:11 +0100)
----------------------------------------------------------------
Chen Yi (1):
selftests: netfilter: Pass family parameter "-f" to conntrack tool
Dinghao Liu (1):
netfilter: nf_nat: Fix memleak in nf_nat_init
Jesper Dangaard Brouer (1):
netfilter: conntrack: fix reading nf_conntrack_buckets
net/netfilter/nf_conntrack_standalone.c | 3 +++ net/netfilter/nf_nat_core.c | 1 + tools/testing/selftests/netfilter/nft_conntrack_helper.sh | 12 +++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/3 selftests: netfilter: Pass family parameter "-f" to conntrack tool
From: Chen Yi <[email protected]>
Fix nft_conntrack_helper.sh false fail report:
1) Conntrack tool need "-f ipv6" parameter to show out ipv6 traffic items.
2) Sleep 1 second after background nc send packet, to make sure check is after this statement executed.
False report:
FAIL: ns1-lkjUemYw did not show attached helper ip set via ruleset
PASS: ns1-lkjUemYw connection on port 2121 has ftp helper attached
...
After fix:
PASS: ns1-2hUniwU2 connection on port 2121 has ftp helper attached
PASS: ns2-2hUniwU2 connection on port 2121 has ftp helper attached
...
--- .../selftests/netfilter/nft_conntrack_helper.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/testing/selftests/netfilter/nft_conntrack_helper.sh +9 -3
@@ -94,7 +94,13 @@ check_for_helper() local message=$2 local port=$3 - ip netns exec ${netns} conntrack -L -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' + if echo $message |grep -q 'ipv6';then + local family="ipv6" + else + local family="ipv4" + fi + + ip netns exec ${netns} conntrack -L -f $family -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' if [ $? -ne 0 ] ; then echo "FAIL: ${netns} did not show attached helper $message" 1>&2 ret=1
@@ -111,8 +117,8 @@ test_helper() sleep 3 | ip netns exec ${ns2} nc -w 2 -l -p $port > /dev/null & - sleep 1 sleep 1 | ip netns exec ${ns1} nc -w 2 10.0.1.2 $port > /dev/null & + sleep 1 check_for_helper "$ns1" "ip $msg" $port check_for_helper "$ns2" "ip $msg" $port
@@ -128,8 +134,8 @@ test_helper() sleep 3 | ip netns exec ${ns2} nc -w 2 -6 -l -p $port > /dev/null & - sleep 1 sleep 1 | ip netns exec ${ns1} nc -w 2 -6 dead:1::2 $port > /dev/null & + sleep 1 check_for_helper "$ns1" "ipv6 $msg" $port check_for_helper "$ns2" "ipv6 $msg" $port
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: conntrack: fix reading nf_conntrack_buckets
In reply to Pablo Neira AyusoFrom: Jesper Dangaard Brouer <[email protected]>
The old way of changing the conntrack hashsize runtime was through changing the module param via file /sys/module/nf_conntrack/parameters/hashsize. This was extended to sysctl change in commit 3183ab8997a4 ("netfilter: conntrack:
allow increasing bucket size via sysctl too").
The commit introduced second "user" variable nf_conntrack_htable_size_user which shadow actual variable nf_conntrack_htable_size. When hashsize is changed via module param this "user" variable isn't updated. This results in sysctl net/netfilter/nf_conntrack_buckets shows the wrong value when users update via the old way.
This patch fix the issue by always updating "user" variable when reading the proc file. This will take care of changes to the actual variable without sysctl need to be aware.
--- net/netfilter/nf_conntrack_standalone.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_conntrack_standalone.c +3 -0
@@ -523,6 +523,9 @@ nf_conntrack_hash_sysctl(struct ctl_table *table, int write, {int ret; +/* module_param hashsize could have changed value */ + nf_conntrack_htable_size_user = nf_conntrack_htable_size; + ret =proc_dointvec (table, write, buffer, lenp, ppos);if (ret <0 || !write)return ret;
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_nat: Fix memleak in nf_nat_init
In reply to Pablo Neira AyusoFrom: Dinghao Liu <[email protected]>
When register_pernet_subsys() fails, nf_nat_bysource should be freed just like when nf_ct_extend_register() fails.
--- net/netfilter/nf_nat_core.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_nat_core.c +1 -0
@@ -1174,6 +1174,7 @@ static int __init nf_nat_init(void) ret =register_pernet_subsys (&nat_net_ops);if (ret <0 ) {nf_ct_extend_unregister (&nat_extend); +kvfree (nf_nat_bysource);return ret; }
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerQuoted 9 lines · On Tue, 12 Jan 2021 23:20:30 +0100 Pablo Neira Ayuso wrote:
The following patchset contains Netfilter fixes for net:
1) Pass conntrack -f to specify family in netfilter conntrack helper selftests, from Chen Yi.
2) Honor hashsize modparam from
nf_conntrack_bucketssysctl, from Jesper D. Brouer.3) Fix memleak in
nf_nat_init()error path, from Dinghao Liu.
Pulled, thanks!