Netfilter fixes for net
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net, they are:
1) Unaligned atomic access in ipset, from Russell King.
2) Missing module description, from Rob Gill.
3) Patches to fix a module unload causing NULL pointer dereference in xtables, from David Wilder. For the record, I posting here his cover letter explaining the problem:
A crash happened on ppc64le when running ltp network tests triggered by "rmmod iptable_mangle".
See previous discussion in this thread:
https://lists.openwall.net/netdev/2020/06/03/161 .
In the crash I found in iptable_mangle_hook() that state->net->ipv4.iptable_mangle=NULL causing a NULL pointer dereference. net->ipv4.iptable_mangle is set to NULL in +iptable_mangle_net_exit() and called when ip_mangle modules is unloaded. A rmmod task was found running in the crash dump. A 2nd crash showed the same problem when running "rmmod iptable_filter" (net->ipv4.iptable_filter=NULL).
To fix this I added .pre_exit hook in all iptable_foo.c. The pre_exit will un-register the underlying hook and exit would do the table freeing. The netns core does an unconditional +synchronize_rcu after the pre_exit hooks insuring no packets are in flight that have picked up the pointer before completing the un-register.
These patches include changes for both iptables and ip6tables.
We tested this fix with ltp running iptables01.sh and iptables01.sh -6 a loop for 72 hours.
4) Add a selftest for conntrack helper assignment, from Florian Westphal.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thank you.
----------------------------------------------------------------
The following changes since commit 67c20de35a3cc2e2cd940f95ebd85ed0a765315a:
net: Add MODULE_DESCRIPTION entries to network modules (2020-06-20 21:33:57 -0700)
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 619ae8e0697a6fb85b99b19137590c7c337c579e:
selftests: netfilter: add test case for conntrack helper assignment (2020-06-25 00:50:31 +0200)
----------------------------------------------------------------
David Wilder (4):
netfilter: iptables: Split ipt_unregister_table() into pre_exit and exit helpers.
netfilter: iptables: Add a .pre_exit hook in all iptable_foo.c.
netfilter: ip6tables: Split ip6t_unregister_table() into pre_exit and exit helpers.
netfilter: ip6tables: Add a .pre_exit hook in all ip6table_foo.c.
Florian Westphal (1):
selftests: netfilter: add test case for conntrack helper assignment
Rob Gill (1):
netfilter: Add MODULE_DESCRIPTION entries to kernel modules
Russell King (1):
netfilter: ipset: fix unaligned atomic access
include/linux/netfilter_ipv4/ip_tables.h | 6 + include/linux/netfilter_ipv6/ip6_tables.h | 3 + net/bridge/netfilter/nft_meta_bridge.c | 1 + net/bridge/netfilter/nft_reject_bridge.c | 1 + net/ipv4/netfilter/ip_tables.c | 15 +- net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/iptable_filter.c | 10 +- net/ipv4/netfilter/iptable_mangle.c | 10 +- net/ipv4/netfilter/iptable_nat.c | 10 +- net/ipv4/netfilter/iptable_raw.c | 10 +- net/ipv4/netfilter/iptable_security.c | 11 +- net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + net/ipv4/netfilter/nft_dup_ipv4.c | 1 + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 1 + net/ipv6/netfilter/ip6_tables.c | 15 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + net/ipv6/netfilter/ip6table_filter.c | 10 +- net/ipv6/netfilter/ip6table_mangle.c | 10 +- net/ipv6/netfilter/ip6table_nat.c | 10 +- net/ipv6/netfilter/ip6table_raw.c | 10 +- net/ipv6/netfilter/ip6table_security.c | 10 +- net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + net/ipv6/netfilter/nft_dup_ipv6.c | 1 + net/ipv6/netfilter/nft_fib_ipv6.c | 1 + net/ipv6/netfilter/nft_reject_ipv6.c | 1 + net/netfilter/ipset/ip_set_core.c | 2 + net/netfilter/nf_dup_netdev.c | 1 + net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_flow_table_inet.c | 1 + net/netfilter/nf_synproxy_core.c | 1 + net/netfilter/nfnetlink.c | 1 + net/netfilter/nft_compat.c | 1 + net/netfilter/nft_connlimit.c | 1 + net/netfilter/nft_counter.c | 1 + net/netfilter/nft_ct.c | 1 + net/netfilter/nft_dup_netdev.c | 1 + net/netfilter/nft_fib_inet.c | 1 + net/netfilter/nft_fib_netdev.c | 1 + net/netfilter/nft_flow_offload.c | 1 + net/netfilter/nft_hash.c | 1 + net/netfilter/nft_limit.c | 1 + net/netfilter/nft_log.c | 1 + net/netfilter/nft_masq.c | 1 + net/netfilter/nft_nat.c | 1 + net/netfilter/nft_numgen.c | 1 + net/netfilter/nft_objref.c | 1 + net/netfilter/nft_osf.c | 1 + net/netfilter/nft_queue.c | 1 + net/netfilter/nft_quota.c | 1 + net/netfilter/nft_redir.c | 1 + net/netfilter/nft_reject.c | 1 + net/netfilter/nft_reject_inet.c | 1 + net/netfilter/nft_synproxy.c | 1 + net/netfilter/nft_tunnel.c | 1 + net/netfilter/xt_nat.c | 1 + tools/testing/selftests/netfilter/Makefile | 2 +- .../selftests/netfilter/nft_conntrack_helper.sh | 175 +++++++++++++++++++++ 58 files changed, 344 insertions(+), 16 deletions(-) create mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: ipset: fix unaligned atomic access
From: Russell King <[email protected]>
When using ip_set with counters and comment, traffic causes the kernel to panic on 32-bit ARM:
Alignment trap: not handling instruction e1b82f9f at [<bf01b0dc>] Unhandled fault: alignment exception (0x221) at 0xea08133c PC is at ip_set_match_extensions+0xe0/0x224 [ip_set]
The problem occurs when we try to update the 64-bit counters - the faulting address above is not 64-bit aligned. The problem occurs due to the way elements are allocated, for example:
set->dsize = ip_set_elem_len(set, tb, 0, 0); map = ip_set_alloc(sizeof(*map) + elements * set->dsize);
If the element has a requirement for a member to be 64-bit aligned, and set->dsize is not a multiple of 8, but is a multiple of four, then every odd numbered elements will be misaligned - and hitting an atomic64_add() on that element will cause the kernel to panic.
ip_set_elem_len() must return a size that is rounded to the maximum alignment of any extension field stored in the element. This change ensures that is the case.
--- net/netfilter/ipset/ip_set_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/ipset/ip_set_core.c +2 -0
@@ -460,6 +460,8 @@ ip_set_elem_len(struct ip_set *set, struct nlattr *tb[], size_t len,for (id =0 ; id <IPSET_EXT_ID_MAX ; id++) {if (!add_extension (id, cadt_flags, tb))continue ; +if (align < ip_set_extensions[id].align) + align = ip_set_extensions[id].align; len =ALIGN (len, ip_set_extensions[id].align); set->offset[id] = len; set->extensions |= ip_set_extensions[id].type;
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: Add MODULE_DESCRIPTION entries to kernel modules
In reply to Pablo Neira AyusoFrom: Rob Gill <[email protected]>
The user tool modinfo is used to get information on kernel modules, including a description where it is available.
This patch adds a brief MODULE_DESCRIPTION to netfilter kernel modules (descriptions taken from Kconfig file or code comments)
--- net/bridge/netfilter/nft_meta_bridge.c | 1 + net/bridge/netfilter/nft_reject_bridge.c | 1 + net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + net/ipv4/netfilter/nft_dup_ipv4.c | 1 + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 1 + net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + net/ipv6/netfilter/nft_dup_ipv6.c | 1 + net/ipv6/netfilter/nft_fib_ipv6.c | 1 + net/ipv6/netfilter/nft_reject_ipv6.c | 1 + net/netfilter/nf_dup_netdev.c | 1 + net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_flow_table_inet.c | 1 + net/netfilter/nf_synproxy_core.c | 1 + net/netfilter/nfnetlink.c | 1 + net/netfilter/nft_compat.c | 1 + net/netfilter/nft_connlimit.c | 1 + net/netfilter/nft_counter.c | 1 + net/netfilter/nft_ct.c | 1 + net/netfilter/nft_dup_netdev.c | 1 + net/netfilter/nft_fib_inet.c | 1 + net/netfilter/nft_fib_netdev.c | 1 + net/netfilter/nft_flow_offload.c | 1 + net/netfilter/nft_hash.c | 1 + net/netfilter/nft_limit.c | 1 + net/netfilter/nft_log.c | 1 + net/netfilter/nft_masq.c | 1 + net/netfilter/nft_nat.c | 1 + net/netfilter/nft_numgen.c | 1 + net/netfilter/nft_objref.c | 1 + net/netfilter/nft_osf.c | 1 + net/netfilter/nft_queue.c | 1 + net/netfilter/nft_quota.c | 1 + net/netfilter/nft_redir.c | 1 + net/netfilter/nft_reject.c | 1 + net/netfilter/nft_reject_inet.c | 1 + net/netfilter/nft_synproxy.c | 1 + net/netfilter/nft_tunnel.c | 1 + net/netfilter/xt_nat.c | 1 + 41 files changed, 41 insertions(+)
net/bridge/netfilter/nft_meta_bridge.c +1 -0
@@ -155,3 +155,4 @@ module_exit(nft_meta_bridge_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("wenxu <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_BRIDGE ,"meta" ); +MODULE_DESCRIPTION ("Support for bridge dedicated meta key" );
net/bridge/netfilter/nft_reject_bridge.c +1 -0
@@ -455,3 +455,4 @@ module_exit(nft_reject_bridge_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_BRIDGE ,"reject" ); +MODULE_DESCRIPTION ("Reject packets from bridge via nftables" );
net/ipv4/netfilter/ipt_SYNPROXY.c +1 -0
@@ -118,3 +118,4 @@ module_exit(synproxy_tg4_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" ); +MODULE_DESCRIPTION ("Intercept TCP connections and establish them using syncookies" );
net/ipv4/netfilter/nf_flow_table_ipv4.c +1 -0
@@ -34,3 +34,4 @@ module_exit(nf_flow_ipv4_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NF_FLOWTABLE (AF_INET ); +MODULE_DESCRIPTION ("Netfilter flow table support" );
net/ipv4/netfilter/nft_dup_ipv4.c +1 -0
@@ -107,3 +107,4 @@ module_exit(nft_dup_ipv4_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_INET ,"dup" ); +MODULE_DESCRIPTION ("IPv4 nftables packet duplication support" );
net/ipv4/netfilter/nft_fib_ipv4.c +1 -0
@@ -210,3 +210,4 @@ module_exit(nft_fib4_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Florian Westphal <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (2 ,"fib" ); +MODULE_DESCRIPTION ("nftables fib / ip route lookup support" );
net/ipv4/netfilter/nft_reject_ipv4.c +1 -0
@@ -71,3 +71,4 @@ module_exit(nft_reject_ipv4_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_INET ,"reject" ); +MODULE_DESCRIPTION ("IPv4 packet rejection for nftables" );
net/ipv6/netfilter/ip6t_SYNPROXY.c +1 -0
@@ -121,3 +121,4 @@ module_exit(synproxy_tg6_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" ); +MODULE_DESCRIPTION ("Intercept IPv6 TCP connections and establish them using syncookies" );
net/ipv6/netfilter/nf_flow_table_ipv6.c +1 -0
@@ -35,3 +35,4 @@ module_exit(nf_flow_ipv6_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NF_FLOWTABLE (AF_INET6 ); +MODULE_DESCRIPTION ("Netfilter flow table IPv6 module" );
net/ipv6/netfilter/nft_dup_ipv6.c +1 -0
@@ -105,3 +105,4 @@ module_exit(nft_dup_ipv6_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_INET6 ,"dup" ); +MODULE_DESCRIPTION ("IPv6 nftables packet duplication support" );
net/ipv6/netfilter/nft_fib_ipv6.c +1 -0
@@ -255,3 +255,4 @@ module_exit(nft_fib6_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Florian Westphal <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (10 ,"fib" ); +MODULE_DESCRIPTION ("nftables fib / ipv6 route lookup support" );
net/ipv6/netfilter/nft_reject_ipv6.c +1 -0
@@ -72,3 +72,4 @@ module_exit(nft_reject_ipv6_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (AF_INET6 ,"reject" ); +MODULE_DESCRIPTION ("IPv6 packet rejection for nftables" );
net/netfilter/nf_dup_netdev.c +1 -0
@@ -73,3 +73,4 @@ EXPORT_SYMBOL_GPL(nft_fwd_dup_netdev_offload);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" ); +MODULE_DESCRIPTION ("Netfilter packet duplication support" );
net/netfilter/nf_flow_table_core.c +1 -0
@@ -594,3 +594,4 @@ module_exit(nf_flow_table_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" ); +MODULE_DESCRIPTION ("Netfilter flow table module" );
net/netfilter/nf_flow_table_inet.c +1 -0
@@ -72,3 +72,4 @@ module_exit(nf_flow_inet_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NF_FLOWTABLE (1 );/* NFPROTO_INET */ +MODULE_DESCRIPTION ("Netfilter flow table mixed IPv4/IPv6 module" );
net/netfilter/nf_synproxy_core.c +1 -0
@@ -1237,3 +1237,4 @@ EXPORT_SYMBOL_GPL(nf_synproxy_ipv6_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" ); +MODULE_DESCRIPTION ("nftables SYNPROXY expression support" );
net/netfilter/nfnetlink.c +1 -0
@@ -33,6 +33,7 @@MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_ALIAS_NET_PF_PROTO (PF_NETLINK ,NETLINK_NETFILTER ); +MODULE_DESCRIPTION ("Netfilter messages via netlink socket" );#define nfnl_dereference_protected (id) \ rcu_dereference_protected(table[(id)].subsys, \
net/netfilter/nft_compat.c +1 -0
@@ -902,3 +902,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("match" );MODULE_ALIAS_NFT_EXPR ("target" ); +MODULE_DESCRIPTION ("x_tables over nftables support" );
net/netfilter/nft_connlimit.c +1 -0
@@ -280,3 +280,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Pablo Neira Ayuso" );MODULE_ALIAS_NFT_EXPR ("connlimit" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_CONNLIMIT ); +MODULE_DESCRIPTION ("nftables connlimit rule support" );
net/netfilter/nft_counter.c +1 -0
@@ -303,3 +303,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("counter" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_COUNTER ); +MODULE_DESCRIPTION ("nftables counter rule support" );
net/netfilter/nft_ct.c +1 -0
@@ -1345,3 +1345,4 @@ MODULE_ALIAS_NFT_EXPR("notrack");MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_CT_HELPER );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_CT_TIMEOUT );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_CT_EXPECT ); +MODULE_DESCRIPTION ("Netfilter nf_tables conntrack module" );
net/netfilter/nft_dup_netdev.c +1 -0
@@ -102,3 +102,4 @@ module_exit(nft_dup_netdev_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (5 ,"dup" ); +MODULE_DESCRIPTION ("nftables netdev packet duplication support" );
net/netfilter/nft_fib_inet.c +1 -0
@@ -76,3 +76,4 @@ module_exit(nft_fib_inet_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Florian Westphal <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (1 ,"fib" ); +MODULE_DESCRIPTION ("nftables fib inet support" );
net/netfilter/nft_fib_netdev.c +1 -0
@@ -85,3 +85,4 @@ module_exit(nft_fib_netdev_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo M. Bermudo Garay <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (5 ,"fib" ); +MODULE_DESCRIPTION ("nftables netdev fib lookups support" );
net/netfilter/nft_flow_offload.c +1 -0
@@ -286,3 +286,4 @@ module_exit(nft_flow_offload_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("flow_offload" ); +MODULE_DESCRIPTION ("nftables hardware flow offload module" );
net/netfilter/nft_hash.c +1 -0
@@ -248,3 +248,4 @@ module_exit(nft_hash_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Laura Garcia <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("hash" ); +MODULE_DESCRIPTION ("Netfilter nftables hash module" );
net/netfilter/nft_limit.c +1 -0
@@ -372,3 +372,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("limit" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_LIMIT ); +MODULE_DESCRIPTION ("nftables limit expression support" );
net/netfilter/nft_log.c +1 -0
@@ -298,3 +298,4 @@ module_exit(nft_log_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("log" ); +MODULE_DESCRIPTION ("Netfilter nf_tables log module" );
net/netfilter/nft_masq.c +1 -0
@@ -305,3 +305,4 @@ module_exit(nft_masq_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Arturo Borrero Gonzalez <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("masq" ); +MODULE_DESCRIPTION ("Netfilter nftables masquerade expression support" );
net/netfilter/nft_nat.c +1 -0
@@ -402,3 +402,4 @@ module_exit(nft_nat_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Tomasz Bursztyka <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("nat" ); +MODULE_DESCRIPTION ("Network Address Translation support" );
net/netfilter/nft_numgen.c +1 -0
@@ -217,3 +217,4 @@ module_exit(nft_ng_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Laura Garcia <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("numgen" ); +MODULE_DESCRIPTION ("nftables number generator module" );
net/netfilter/nft_objref.c +1 -0
@@ -252,3 +252,4 @@ module_exit(nft_objref_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("objref" ); +MODULE_DESCRIPTION ("nftables stateful object reference module" );
net/netfilter/nft_osf.c +1 -0
@@ -149,3 +149,4 @@ module_exit(nft_osf_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Fernando Fernandez <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("osf" ); +MODULE_DESCRIPTION ("nftables passive OS fingerprint support" );
net/netfilter/nft_queue.c +1 -0
@@ -216,3 +216,4 @@ module_exit(nft_queue_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Eric Leblond <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("queue" ); +MODULE_DESCRIPTION ("Netfilter nftables queue module" );
net/netfilter/nft_quota.c +1 -0
@@ -254,3 +254,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("quota" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_QUOTA ); +MODULE_DESCRIPTION ("Netfilter nftables quota module" );
net/netfilter/nft_redir.c +1 -0
@@ -292,3 +292,4 @@ module_exit(nft_redir_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Arturo Borrero Gonzalez <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("redir" ); +MODULE_DESCRIPTION ("Netfilter nftables redirect support" );
net/netfilter/nft_reject.c +1 -0
@@ -119,3 +119,4 @@ EXPORT_SYMBOL_GPL(nft_reject_icmpv6_code);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" ); +MODULE_DESCRIPTION ("Netfilter x_tables over nftables module" );
net/netfilter/nft_reject_inet.c +1 -0
@@ -149,3 +149,4 @@ module_exit(nft_reject_inet_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );MODULE_ALIAS_NFT_AF_EXPR (1 ,"reject" ); +MODULE_DESCRIPTION ("Netfilter nftables reject inet support" );
net/netfilter/nft_synproxy.c +1 -0
@@ -388,3 +388,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Fernando Fernandez <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("synproxy" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_SYNPROXY ); +MODULE_DESCRIPTION ("nftables SYNPROXY expression support" );
net/netfilter/nft_tunnel.c +1 -0
@@ -719,3 +719,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );MODULE_ALIAS_NFT_EXPR ("tunnel" );MODULE_ALIAS_NFT_OBJ (NFT_OBJECT_TUNNEL ); +MODULE_DESCRIPTION ("nftables tunnel expression support" );
net/netfilter/xt_nat.c +1 -0
@@ -244,3 +244,4 @@ MODULE_ALIAS("ipt_SNAT");MODULE_ALIAS ("ipt_DNAT" );MODULE_ALIAS ("ip6t_SNAT" );MODULE_ALIAS ("ip6t_DNAT" ); +MODULE_DESCRIPTION ("SNAT and DNAT targets support" );
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/7 netfilter: iptables: Split ipt_unregister_table() into pre_exit and exit helpers.
In reply to Pablo Neira AyusoFrom: David Wilder <[email protected]>
The pre_exit will un-register the underlying hook and .exit will do the table freeing. The netns core does an unconditional synchronize_rcu after the pre_exit hooks insuring no packets are in flight that have picked up the pointer before completing the un-register.
--- include/linux/netfilter_ipv4/ip_tables.h | 6 ++++++ net/ipv4/netfilter/ip_tables.c | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
include/linux/netfilter_ipv4/ip_tables.h +6 -0
@@ -25,6 +25,12 @@int ipt_register_table (struct net *net,const struct xt_table *table,const struct ipt_replace *repl,const struct nf_hook_ops *ops,struct xt_table **res); + +void ipt_unregister_table_pre_exit (struct net *net,struct xt_table *table, +const struct nf_hook_ops *ops); + +void ipt_unregister_table_exit (struct net *net,struct xt_table *table); +void ipt_unregister_table (struct net *net,struct xt_table *table,const struct nf_hook_ops *ops);
net/ipv4/netfilter/ip_tables.c +14 -1
@@ -1797,11 +1797,22 @@ int ipt_register_table(struct net *net, const struct xt_table *table,return ret; } +void ipt_unregister_table_pre_exit (struct net *net,struct xt_table *table, +const struct nf_hook_ops *ops) +{ +nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); +} + +void ipt_unregister_table_exit (struct net *net,struct xt_table *table) +{ +__ipt_unregister_table (net, table); +} +void ipt_unregister_table (struct net *net,struct xt_table *table,const struct nf_hook_ops *ops) {if (ops) -nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); +ipt_unregister_table_pre_exit (net, table, ops);__ipt_unregister_table (net, table); }
@@ -1958,6 +1969,8 @@ static void __exit ip_tables_fini(void)EXPORT_SYMBOL (ipt_register_table);EXPORT_SYMBOL (ipt_unregister_table); +EXPORT_SYMBOL (ipt_unregister_table_pre_exit); +EXPORT_SYMBOL (ipt_unregister_table_exit);EXPORT_SYMBOL (ipt_do_table);module_init (ip_tables_init);module_exit (ip_tables_fini);
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: iptables: Add a .pre_exit hook in all iptable_foo.c.
In reply to Pablo Neira AyusoFrom: David Wilder <[email protected]>
Using new helpers ipt_unregister_table_pre_exit() and ipt_unregister_table_exit().
--- net/ipv4/netfilter/iptable_filter.c | 10 +++++++++- net/ipv4/netfilter/iptable_mangle.c | 10 +++++++++- net/ipv4/netfilter/iptable_nat.c | 10 ++++++++-- net/ipv4/netfilter/iptable_raw.c | 10 +++++++++- net/ipv4/netfilter/iptable_security.c | 11 +++++++++-- 5 files changed, 44 insertions(+), 7 deletions(-)
net/ipv4/netfilter/iptable_filter.c +9 -1
@@ -72,16 +72,24 @@ static int __net_init iptable_filter_net_init(struct net *net)return 0 ; } +static void __net_exit iptable_filter_net_pre_exit(struct net *net) +{ +if (net->ipv4.iptable_filter) +ipt_unregister_table_pre_exit (net, net->ipv4.iptable_filter, + filter_ops); +} + static void __net_exit iptable_filter_net_exit(struct net *net) {if (!net->ipv4.iptable_filter)return ; -ipt_unregister_table (net, net->ipv4.iptable_filter, filter_ops); +ipt_unregister_table_exit (net, net->ipv4.iptable_filter); net->ipv4.iptable_filter =NULL ; }static struct pernet_operations iptable_filter_net_ops = { .init = iptable_filter_net_init, + .pre_exit = iptable_filter_net_pre_exit, .exit = iptable_filter_net_exit, };
net/ipv4/netfilter/iptable_mangle.c +9 -1
@@ -100,15 +100,23 @@ static int __net_init iptable_mangle_table_init(struct net *net)return ret; } +static void __net_exit iptable_mangle_net_pre_exit(struct net *net) +{ +if (net->ipv4.iptable_mangle) +ipt_unregister_table_pre_exit (net, net->ipv4.iptable_mangle, + mangle_ops); +} + static void __net_exit iptable_mangle_net_exit(struct net *net) {if (!net->ipv4.iptable_mangle)return ; -ipt_unregister_table (net, net->ipv4.iptable_mangle, mangle_ops); +ipt_unregister_table_exit (net, net->ipv4.iptable_mangle); net->ipv4.iptable_mangle =NULL ; }static struct pernet_operations iptable_mangle_net_ops = { + .pre_exit = iptable_mangle_net_pre_exit, .exit = iptable_mangle_net_exit, };
net/ipv4/netfilter/iptable_nat.c +8 -2
@@ -113,16 +113,22 @@ static int __net_init iptable_nat_table_init(struct net *net)return ret; } +static void __net_exit iptable_nat_net_pre_exit(struct net *net) +{ +if (net->ipv4.nat_table) +ipt_nat_unregister_lookups (net); +} + static void __net_exit iptable_nat_net_exit(struct net *net) {if (!net->ipv4.nat_table)return ; -ipt_nat_unregister_lookups (net); -ipt_unregister_table (net, net->ipv4.nat_table,NULL ); +ipt_unregister_table_exit (net, net->ipv4.nat_table); net->ipv4.nat_table =NULL ; }static struct pernet_operations iptable_nat_net_ops = { + .pre_exit = iptable_nat_net_pre_exit, .exit = iptable_nat_net_exit, };
net/ipv4/netfilter/iptable_raw.c +9 -1
@@ -67,15 +67,23 @@ static int __net_init iptable_raw_table_init(struct net *net)return ret; } +static void __net_exit iptable_raw_net_pre_exit(struct net *net) +{ +if (net->ipv4.iptable_raw) +ipt_unregister_table_pre_exit (net, net->ipv4.iptable_raw, + rawtable_ops); +} + static void __net_exit iptable_raw_net_exit(struct net *net) {if (!net->ipv4.iptable_raw)return ; -ipt_unregister_table (net, net->ipv4.iptable_raw, rawtable_ops); +ipt_unregister_table_exit (net, net->ipv4.iptable_raw); net->ipv4.iptable_raw =NULL ; }static struct pernet_operations iptable_raw_net_ops = { + .pre_exit = iptable_raw_net_pre_exit, .exit = iptable_raw_net_exit, };
net/ipv4/netfilter/iptable_security.c +9 -2
@@ -62,16 +62,23 @@ static int __net_init iptable_security_table_init(struct net *net)return ret; } +static void __net_exit iptable_security_net_pre_exit(struct net *net) +{ +if (net->ipv4.iptable_security) +ipt_unregister_table_pre_exit (net, net->ipv4.iptable_security, + sectbl_ops); +} + static void __net_exit iptable_security_net_exit(struct net *net) {if (!net->ipv4.iptable_security)return ; - -ipt_unregister_table (net, net->ipv4.iptable_security, sectbl_ops); +ipt_unregister_table_exit (net, net->ipv4.iptable_security); net->ipv4.iptable_security =NULL ; }static struct pernet_operations iptable_security_net_ops = { + .pre_exit = iptable_security_net_pre_exit, .exit = iptable_security_net_exit, };
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: ip6tables: Split ip6t_unregister_table() into pre_exit and exit helpers.
In reply to Pablo Neira AyusoFrom: David Wilder <[email protected]>
The pre_exit will un-register the underlying hook and .exit will do the table freeing. The netns core does an unconditional synchronize_rcu after the pre_exit hooks insuring no packets are in flight that have picked up the pointer before completing the un-register.
--- include/linux/netfilter_ipv6/ip6_tables.h | 3 +++ net/ipv6/netfilter/ip6_tables.c | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
include/linux/netfilter_ipv6/ip6_tables.h +3 -0
@@ -29,6 +29,9 @@ int ip6t_register_table(struct net *net, const struct xt_table *table, const struct nf_hook_ops *ops, struct xt_table **res);void ip6t_unregister_table (struct net *net,struct xt_table *table,const struct nf_hook_ops *ops); +void ip6t_unregister_table_pre_exit (struct net *net,struct xt_table *table, +const struct nf_hook_ops *ops); +void ip6t_unregister_table_exit (struct net *net,struct xt_table *table);extern unsigned int ip6t_do_table (struct sk_buff *skb,const struct nf_hook_state *state,struct xt_table *table);
net/ipv6/netfilter/ip6_tables.c +14 -1
@@ -1807,11 +1807,22 @@ int ip6t_register_table(struct net *net, const struct xt_table *table,return ret; } +void ip6t_unregister_table_pre_exit (struct net *net,struct xt_table *table, +const struct nf_hook_ops *ops) +{ +nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); +} + +void ip6t_unregister_table_exit (struct net *net,struct xt_table *table) +{ +__ip6t_unregister_table (net, table); +} +void ip6t_unregister_table (struct net *net,struct xt_table *table,const struct nf_hook_ops *ops) {if (ops) -nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); +ip6t_unregister_table_pre_exit (net, table, ops);__ip6t_unregister_table (net, table); }
@@ -1969,6 +1980,8 @@ static void __exit ip6_tables_fini(void)EXPORT_SYMBOL (ip6t_register_table);EXPORT_SYMBOL (ip6t_unregister_table); +EXPORT_SYMBOL (ip6t_unregister_table_pre_exit); +EXPORT_SYMBOL (ip6t_unregister_table_exit);EXPORT_SYMBOL (ip6t_do_table);module_init (ip6_tables_init);
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 6/7 netfilter: ip6tables: Add a .pre_exit hook in all ip6table_foo.c.
In reply to Pablo Neira AyusoFrom: David Wilder <[email protected]>
Using new helpers ip6t_unregister_table_pre_exit() and ip6t_unregister_table_exit().
--- net/ipv6/netfilter/ip6table_filter.c | 10 +++++++++- net/ipv6/netfilter/ip6table_mangle.c | 10 +++++++++- net/ipv6/netfilter/ip6table_nat.c | 10 ++++++++-- net/ipv6/netfilter/ip6table_raw.c | 10 +++++++++- net/ipv6/netfilter/ip6table_security.c | 10 +++++++++- 5 files changed, 44 insertions(+), 6 deletions(-)
net/ipv6/netfilter/ip6table_filter.c +9 -1
@@ -73,16 +73,24 @@ static int __net_init ip6table_filter_net_init(struct net *net)return 0 ; } +static void __net_exit ip6table_filter_net_pre_exit(struct net *net) +{ +if (net->ipv6.ip6table_filter) +ip6t_unregister_table_pre_exit (net, net->ipv6.ip6table_filter, + filter_ops); +} + static void __net_exit ip6table_filter_net_exit(struct net *net) {if (!net->ipv6.ip6table_filter)return ; -ip6t_unregister_table (net, net->ipv6.ip6table_filter, filter_ops); +ip6t_unregister_table_exit (net, net->ipv6.ip6table_filter); net->ipv6.ip6table_filter =NULL ; }static struct pernet_operations ip6table_filter_net_ops = { .init = ip6table_filter_net_init, + .pre_exit = ip6table_filter_net_pre_exit, .exit = ip6table_filter_net_exit, };
net/ipv6/netfilter/ip6table_mangle.c +9 -1
@@ -93,16 +93,24 @@ static int __net_init ip6table_mangle_table_init(struct net *net)return ret; } +static void __net_exit ip6table_mangle_net_pre_exit(struct net *net) +{ +if (net->ipv6.ip6table_mangle) +ip6t_unregister_table_pre_exit (net, net->ipv6.ip6table_mangle, + mangle_ops); +} + static void __net_exit ip6table_mangle_net_exit(struct net *net) {if (!net->ipv6.ip6table_mangle)return ; -ip6t_unregister_table (net, net->ipv6.ip6table_mangle, mangle_ops); +ip6t_unregister_table_exit (net, net->ipv6.ip6table_mangle); net->ipv6.ip6table_mangle =NULL ; }static struct pernet_operations ip6table_mangle_net_ops = { + .pre_exit = ip6table_mangle_net_pre_exit, .exit = ip6table_mangle_net_exit, };
net/ipv6/netfilter/ip6table_nat.c +8 -2
@@ -114,16 +114,22 @@ static int __net_init ip6table_nat_table_init(struct net *net)return ret; } +static void __net_exit ip6table_nat_net_pre_exit(struct net *net) +{ +if (net->ipv6.ip6table_nat) +ip6t_nat_unregister_lookups (net); +} + static void __net_exit ip6table_nat_net_exit(struct net *net) {if (!net->ipv6.ip6table_nat)return ; -ip6t_nat_unregister_lookups (net); -ip6t_unregister_table (net, net->ipv6.ip6table_nat,NULL ); +ip6t_unregister_table_exit (net, net->ipv6.ip6table_nat); net->ipv6.ip6table_nat =NULL ; }static struct pernet_operations ip6table_nat_net_ops = { + .pre_exit = ip6table_nat_net_pre_exit, .exit = ip6table_nat_net_exit, };
net/ipv6/netfilter/ip6table_raw.c +9 -1
@@ -66,15 +66,23 @@ static int __net_init ip6table_raw_table_init(struct net *net)return ret; } +static void __net_exit ip6table_raw_net_pre_exit(struct net *net) +{ +if (net->ipv6.ip6table_raw) +ip6t_unregister_table_pre_exit (net, net->ipv6.ip6table_raw, + rawtable_ops); +} + static void __net_exit ip6table_raw_net_exit(struct net *net) {if (!net->ipv6.ip6table_raw)return ; -ip6t_unregister_table (net, net->ipv6.ip6table_raw, rawtable_ops); +ip6t_unregister_table_exit (net, net->ipv6.ip6table_raw); net->ipv6.ip6table_raw =NULL ; }static struct pernet_operations ip6table_raw_net_ops = { + .pre_exit = ip6table_raw_net_pre_exit, .exit = ip6table_raw_net_exit, };
net/ipv6/netfilter/ip6table_security.c +9 -1
@@ -61,15 +61,23 @@ static int __net_init ip6table_security_table_init(struct net *net)return ret; } +static void __net_exit ip6table_security_net_pre_exit(struct net *net) +{ +if (net->ipv6.ip6table_security) +ip6t_unregister_table_pre_exit (net, net->ipv6.ip6table_security, + sectbl_ops); +} + static void __net_exit ip6table_security_net_exit(struct net *net) {if (!net->ipv6.ip6table_security)return ; -ip6t_unregister_table (net, net->ipv6.ip6table_security, sectbl_ops); +ip6t_unregister_table_exit (net, net->ipv6.ip6table_security); net->ipv6.ip6table_security =NULL ; }static struct pernet_operations ip6table_security_net_ops = { + .pre_exit = ip6table_security_net_pre_exit, .exit = ip6table_security_net_exit, };
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 7/7 selftests: netfilter: add test case for conntrack helper assignment
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
check that 'nft ... ct helper set <foo>' works:
1. configure ftp helper via nft and assign it to connections on port 2121
2. check with 'conntrack -L' that the next connection has the ftp helper attached to it.
Also add a test for auto-assign (old behaviour).
--- tools/testing/selftests/netfilter/Makefile | 2 +- .../netfilter/nft_conntrack_helper.sh | 175 ++++++++++++++++++ 2 files changed, 176 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh
tools/testing/selftests/netfilter/Makefile +1 -1
@@ -3,7 +3,7 @@ TEST_PROGS := nft_trans_stress.sh nft_nat.sh bridge_brouter.sh \ conntrack_icmp_related.sh nft_flowtable.sh ipvs.sh \ - nft_concat_range.sh \ + nft_concat_range.sh nft_conntrack_helper.sh \ nft_queue.sh LDLIBS = -lmnl
tools/testing/selftests/netfilter/nft_conntrack_helper.sh new file +175 -0
175 lines not on this page · raw message
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Thu, 25 Jun 2020 20:26:28 +0200
Quoted 1 line
The following patchset contains Netfilter fixes for net, they are:
...
Quoted 3 lines
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, thanks Pablo.