Subject: netfilter: updates for net-next
Subsystems (6)
Florian Westphal
maintainercover Subject: netfilter: updates for net-next
Hi,
The following patchset contains Netfilter fixes for *net-next*:
1) Speed up nftables transactions after earlier transaction failed. Due to a (harmeless) bug we remained in slow paranoia mode until a successful transaction completes.
2) Allow generic tracker to resolve clashes, this avoids very rare packet drops. From Yuto Hamaguchi.
3) Increase the cleanup budget to 64 entries in nf_conncount to reap more entries in one go, from Fernando Fernandez Mancera.
4) Allow icmp trackers to resolve clashes, this avoids very rare initial packet drop with test cases that have high-frequency pings. After this all trackers except tcp and sctp allow clash resolution.
5) Disentangle netfilter headers, don't include nftables/xtables headers in subsystems that are unrelated.
6) Don't rely on implicit includes coming from nf_conntrack_proto_gre.h.
7) Allow nfnetlink_queue nfq instance struct to get accounted via memcg, from Scott Mitchell.
8) Reject bogus xt target/match data upfront via netlink policiy in nft_compat interface rather than relying on x_tables API to do it.
9) Fix nf_conncount breakage when trying to limit loopback flows via prerouting rule, from Fernando Fernandez Mancera.
This is a recent breakage but not seen as urgent enough to rush this via net tree at this late stage in development cycle.
10) Fix a possible off-by-one when parsing tcp option in xtables tcpmss match. Also handled via -next due to late stage in development cycle.
0003-netfilter-nf_conncount-increase-the-connection-clean.patch fixes commit from v5.19-rc1~159^2~45^2~2 0008-netfilter-nft_compat-add-more-restrictions-on-netlin.patch fixes commit from v3.13-rc1~105^2~186^2~8 0009-netfilter-nf_conncount-fix-tracking-of-connections-f.patch fixes commit from nf-next-25-11-28~6
Please, pull these changes from:
The following changes since commit 77b9c4a438fc66e2ab004c411056b3fb71a54f2c:
Merge branch 'netkit-support-for-io_uring-zero-copy-and-af_xdp' (2026-01-20 12:25:29 +0100)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-26-01-20
for you to fetch changes up to 735ee8582da3d239eb0c7a53adca61b79fb228b3:
netfilter: xt_tcpmss: check remaining length before reading optlen (2026-01-20 16:23:38 +0100)
----------------------------------------------------------------
netfilter pull request nf-next-26-01-20
----------------------------------------------------------------
Fernando Fernandez Mancera (2):
netfilter: nf_conncount: increase the connection clean up limit to 64
netfilter: nf_conncount: fix tracking of connections from localhost
Florian Westphal (6):
netfilter: nf_tables: reset table validation state on abort
netfilter: nf_conntrack: enable icmp clash support
netfilter: don't include xt and nftables.h in unrelated subsystems
netfilter: nf_conntrack: don't rely on implicit includes
netfilter: nft_compat: add more restrictions on netlink attributes
netfilter: xt_tcpmss: check remaining length before reading optlen
Scott Mitchell (1):
netfilter: nfnetlink_queue: nfqnl_instance GFP_ATOMIC -> GFP_KERNEL_ACCOUNT allocation
Yuto Hamaguchi (1):
netfilter: nf_conntrack: Add allow_clash to generic protocol handler
include/linux/audit.h | 1 - .../linux/netfilter/nf_conntrack_proto_gre.h | 3 - include/net/netfilter/nf_conntrack.h | 1 + include/net/netfilter/nf_conntrack_count.h | 1 + include/net/netfilter/nf_conntrack_tuple.h | 2 +- include/net/netfilter/nf_tables.h | 1 - net/bridge/netfilter/nf_conntrack_bridge.c | 3 +- net/netfilter/nf_conncount.c | 30 ++++++-- net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_h323_main.c | 1 + net/netfilter/nf_conntrack_netlink.c | 1 + net/netfilter/nf_conntrack_proto_generic.c | 1 + net/netfilter/nf_conntrack_proto_gre.c | 2 + net/netfilter/nf_conntrack_proto_icmp.c | 1 + net/netfilter/nf_conntrack_proto_icmpv6.c | 1 + net/netfilter/nf_flow_table_ip.c | 2 + net/netfilter/nf_flow_table_offload.c | 1 + net/netfilter/nf_flow_table_path.c | 1 + net/netfilter/nf_nat_ovs.c | 3 + net/netfilter/nf_nat_proto.c | 1 + net/netfilter/nf_synproxy_core.c | 1 + net/netfilter/nf_tables_api.c | 8 ++ net/netfilter/nfnetlink_queue.c | 75 +++++++++---------- net/netfilter/nft_compat.c | 13 +++- net/netfilter/nft_flow_offload.c | 1 + net/netfilter/nft_synproxy.c | 1 + net/netfilter/xt_tcpmss.c | 2 +- net/sched/act_ct.c | 2 + net/sched/act_ctinfo.c | 1 + 29 files changed, 102 insertions(+), 60 deletions(-)
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 1/10 netfilter: nf_tables: reset table validation state on abort
If a transaction fails the final validation in the commit hook, the table validation state is changed to NFT_VALIDATE_DO and a replay of the batch is performed. Every rule insert will then do a graph validation.
This is much slower, but provides better error reporting to the user because we can point at the rule that introduces the validation issue.
Without this reset the affected table(s) remain in full validation mode, i.e. on next transaction we start with slow-mode.
This makes the next transaction after a failed incremental update very slow:
# time iptables-restore < /tmp/ruleset real 0m0.496s [..] # time iptables -A CALLEE -j CALLER iptables v1.8.11 (nf_tables): RULE_APPEND failed (Too many links): rule in chain CALLEE real 0m0.022s [..] # time iptables-restore < /tmp/ruleset real 1m22.355s [..]
After this patch, 2nd iptables-restore is back to ~0.5s.
--- net/netfilter/nf_tables_api.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/netfilter/nf_tables_api.c +7 -0
@@ -11536,6 +11536,13 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, ret =__nf_tables_abort (net, action);nft_gc_seq_end (nft_net, gc_seq); +if (action ==NFNL_ABORT_NONE ) { +struct nft_table *table; + +list_for_each_entry (table, &nft_net->tables, list) + table->validate_state =NFT_VALIDATE_SKIP ; + } +WARN_ON_ONCE (!list_empty (&nft_net->commit_list));/* module autoload needs to happen after GC sequence update because it
Signature · 1 line
2.52.0
Re: [PATCH net-next 01/10] netfilter: nf_tables: reset table validation state on abort
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Quoted 8 lines · On Tue, 20 Jan 2026 20:17:54 +0100 you wrote:
If a transaction fails the final validation in the commit hook, the table validation state is changed to
NFT_VALIDATE_DOand a replay of the batch is performed. Every rule insert will then do a graph validation.This is much slower, but provides better error reporting to the user because we can point at the rule that introduces the validation issue.
[...]
Here is the summary with links:
- [net-next,01/10] netfilter: nf_tables: reset table validation state on abort
https://git.kernel.org/netdev/net-next/c/6f93616a7323 - [net-next,02/10] netfilter: nf_conntrack: Add allow_clash to generic protocol handler https://git.kernel.org/netdev/net-next/c/8a49fc8d8a3e - [net-next,03/10] netfilter: nf_conncount: increase the connection clean up limit to 64 https://git.kernel.org/netdev/net-next/c/21d033e47273 - [net-next,04/10] netfilter: nf_conntrack: enable icmp clash support https://git.kernel.org/netdev/net-next/c/f7becf0dad8f - [net-next,05/10] netfilter: don't include xt and nftables.h in unrelated subsystems https://git.kernel.org/netdev/net-next/c/910d27122775 - [net-next,06/10] netfilter: nf_conntrack: don't rely on implicit includes https://git.kernel.org/netdev/net-next/c/d00453b6e3a3 - [net-next,07/10] netfilter: nfnetlink_queue: nfqnl_instance GFP_ATOMIC -> GFP_KERNEL_ACCOUNT allocation https://git.kernel.org/netdev/net-next/c/a4400a5b343d - [net-next,08/10] netfilter: nft_compat: add more restrictions on netlink attributes https://git.kernel.org/netdev/net-next/c/cda26c645946 - [net-next,09/10] netfilter: nf_conncount: fix tracking of connections from localhost https://git.kernel.org/netdev/net-next/c/de8a70cefcb2 - [net-next,10/10] netfilter: xt_tcpmss: check remaining length before reading optlen https://git.kernel.org/netdev/net-next/c/735ee8582da3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Florian Westphal
maintainerPATCH 2/10 netfilter: nf_conntrack: Add allow_clash to generic protocol handler
In reply to Florian WestphalFrom: Yuto Hamaguchi <[email protected]>
The upstream commit, 71d8c47fc653711c41bc3282e5b0e605b3727956
("netfilter: conntrack: introduce clash resolution on insertion race"),
sets allow_clash=true in the UDP/UDPLITE protocol handler but does not set it in the generic protocol handler.
As a result, packets composed of connectionless protocols at each layer, such as UDP over IP-in-IP, still drop packets due to conflicts during conntrack insertion.
To resolve this, this patch sets allow_clash in the nf_conntrack_l4proto_generic.
--- net/netfilter/nf_conntrack_proto_generic.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_conntrack_proto_generic.c +1 -0
@@ -67,6 +67,7 @@ void nf_conntrack_generic_init_net(struct net *net)const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = { .l4proto =255 , + .allow_clash = true, #ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = generic_timeout_nlattr_to_obj,
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 3/10 netfilter: nf_conncount: increase the connection clean up limit to 64
In reply to Florian WestphalFrom: Fernando Fernandez Mancera <[email protected]>
After the optimization to only perform one GC per jiffy, a new problem was introduced. If more than 8 new connections are tracked per jiffy the list won't be cleaned up fast enough possibly reaching the limit wrongly.
In order to prevent this issue, only skip the GC if it was already triggered during the same jiffy and the increment is lower than the clean up limit. In addition, increase the clean up limit to 64 connections to avoid triggering GC too often and do more effective GCs.
This has been tested using a HTTP server and several performance tools while having nft_connlimit/xt_connlimit or OVS limit configured.
Output of slowhttptest + OVS limit at 52000 connections:
slow HTTP test status on 340th second:
initializing: 0 pending: 432 connected: 51998 error: 0 closed: 0 service available: YES
--- include/net/netfilter/nf_conntrack_count.h | 1 + net/netfilter/nf_conncount.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
include/net/netfilter/nf_conntrack_count.h +1 -0
@@ -13,6 +13,7 @@ struct nf_conncount_list {u32 last_gc;/* jiffies at most recent gc */ struct list_head head;/* connections with the same filtering key */ unsigned int count;/* length of list */ +unsigned int last_gc_count;/* length of list at most recent gc */ };struct nf_conncount_data *nf_conncount_init (struct net *net,unsigned int keylen);
net/netfilter/nf_conncount.c +10 -5
@@ -34,8 +34,9 @@#define CONNCOUNT_SLOTS 256U -#define CONNCOUNT_GC_MAX_NODES 8 -#define MAX_KEYLEN 5 +#define CONNCOUNT_GC_MAX_NODES 8 +#define CONNCOUNT_GC_MAX_COLLECT 64 +#define MAX_KEYLEN 5/* we will save the tuples of all connections we care about */ struct nf_conncount_tuple {
@@ -182,12 +183,13 @@ static int __nf_conncount_add(struct net *net, goto out_put; } -if ((u32 )jiffies == list->last_gc) +if ((u32 )jiffies == list->last_gc && + (list->count - list->last_gc_count) <CONNCOUNT_GC_MAX_COLLECT ) goto add_new_node;/* check the saved connections */ list_for_each_entry_safe (conn, conn_n, &list->head, node) { -if (collect >CONNCOUNT_GC_MAX_NODES ) +if (collect >CONNCOUNT_GC_MAX_COLLECT )break ; found =find_or_evict (net, list, conn);
@@ -230,6 +232,7 @@ static int __nf_conncount_add(struct net *net,nf_ct_put (found_ct); } list->last_gc = (u32 )jiffies; + list->last_gc_count = list->count; add_new_node:if (WARN_ON_ONCE (list->count >INT_MAX )) {
@@ -277,6 +280,7 @@ void nf_conncount_list_init(struct nf_conncount_list *list)spin_lock_init (&list->list_lock);INIT_LIST_HEAD (&list->head); list->count =0 ; + list->last_gc_count =0 ; list->last_gc = (u32 )jiffies; }EXPORT_SYMBOL_GPL (nf_conncount_list_init);
@@ -316,13 +320,14 @@ static bool __nf_conncount_gc_list(struct net *net, }nf_ct_put (found_ct); -if (collected >CONNCOUNT_GC_MAX_NODES ) +if (collected >CONNCOUNT_GC_MAX_COLLECT )break ; }if (!list->count) ret = true; list->last_gc = (u32 )jiffies; + list->last_gc_count = list->count;return ret; }
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 4/10 netfilter: nf_conntrack: enable icmp clash support
In reply to Florian WestphalNot strictly required, but should not be harmful either:
This isn't a stateful protocol, hence clash resolution should work fine.
--- net/netfilter/nf_conntrack_proto_icmp.c | 1 + net/netfilter/nf_conntrack_proto_icmpv6.c | 1 + 2 files changed, 2 insertions(+)
net/netfilter/nf_conntrack_proto_icmp.c +1 -0
@@ -365,6 +365,7 @@ void nf_conntrack_icmp_init_net(struct net *net)const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = { .l4proto =IPPROTO_ICMP , + .allow_clash = true, #if IS_ENABLED(CONFIG_NF_CT_NETLINK) .tuple_to_nlattr = icmp_tuple_to_nlattr, .nlattr_tuple_size = icmp_nlattr_tuple_size,
net/netfilter/nf_conntrack_proto_icmpv6.c +1 -0
@@ -343,6 +343,7 @@ void nf_conntrack_icmpv6_init_net(struct net *net)const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 = { .l4proto =IPPROTO_ICMPV6 , + .allow_clash = true, #if IS_ENABLED(CONFIG_NF_CT_NETLINK) .tuple_to_nlattr = icmpv6_tuple_to_nlattr, .nlattr_tuple_size = icmpv6_nlattr_tuple_size,
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 5/10 netfilter: don't include xt and nftables.h in unrelated subsystems
In reply to Florian Westphalconntrack, xtables and nftables are distinct subsystems, don't use them in other subystems.
--- include/linux/audit.h | 1 - include/net/netfilter/nf_conntrack_tuple.h | 2 +- include/net/netfilter/nf_tables.h | 1 - net/bridge/netfilter/nf_conntrack_bridge.c | 3 +-- net/netfilter/nf_conntrack_h323_main.c | 1 + net/netfilter/nf_synproxy_core.c | 1 + net/netfilter/nf_tables_api.c | 1 + net/netfilter/nft_synproxy.c | 1 + 8 files changed, 6 insertions(+), 5 deletions(-)
include/linux/audit.h +0 -1
@@ -13,7 +13,6 @@#include <linux/ptrace.h> #include <linux/audit_arch.h> #include <uapi/linux/audit.h> -#include <uapi/linux/netfilter/nf_tables.h> #include <uapi/linux/fanotify.h> #define AUDIT_INO_UNSET ((unsigned long)-1)
include/net/netfilter/nf_conntrack_tuple.h +1 -1
@@ -11,7 +11,7 @@#ifndef _NF_CONNTRACK_TUPLE_H#define _NF_CONNTRACK_TUPLE_H -#include <linux/netfilter/x_tables.h> +#include <linux/netfilter.h> #include <linux/netfilter/nf_conntrack_tuple_common.h> #include <linux/list_nulls.h>
include/net/netfilter/nf_tables.h +0 -1
@@ -6,7 +6,6 @@#include <linux/list.h> #include <linux/netfilter.h> #include <linux/netfilter/nfnetlink.h> -#include <linux/netfilter/x_tables.h> #include <linux/netfilter/nf_tables.h> #include <linux/u64_stats_sync.h> #include <linux/rhashtable.h>
net/bridge/netfilter/nf_conntrack_bridge.c +1 -2
@@ -16,8 +16,7 @@#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_bridge.h> -#include <linux/netfilter/nf_tables.h> -#include <net/netfilter/nf_tables.h> +#include <linux/netfilter_ipv4.h> #include "../br_private.h"
net/netfilter/nf_conntrack_h323_main.c +1 -0
@@ -23,6 +23,7 @@#include <linux/skbuff.h> #include <net/route.h> #include <net/ip6_route.h> +#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h> #include <net/netfilter/nf_conntrack.h>
net/netfilter/nf_synproxy_core.c +1 -0
@@ -10,6 +10,7 @@#include <net/netns/generic.h> #include <linux/proc_fs.h> +#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h> #include <linux/netfilter/nf_synproxy.h>
net/netfilter/nf_tables_api.c +1 -0
@@ -14,6 +14,7 @@#include <linux/rhashtable.h> #include <linux/audit.h> #include <linux/netfilter.h> +#include <linux/netfilter_ipv4.h> #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_flow_table.h>
net/netfilter/nft_synproxy.c +1 -0
@@ -7,6 +7,7 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_synproxy.h> #include <net/netfilter/nf_synproxy.h> +#include <linux/netfilter_ipv4.h> #include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_synproxy.h>
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 6/10 netfilter: nf_conntrack: don't rely on implicit includes
In reply to Florian Westphalseveral netfilter compilation units rely on implicit includes coming from nf_conntrack_proto_gre.h.
Clean this up and add the required dependencies where needed.
nf_conntrack.h requires net_generic() helper.
Place various gre/ppp/vlan includes to where they are needed.
--- include/linux/netfilter/nf_conntrack_proto_gre.h | 3 --- include/net/netfilter/nf_conntrack.h | 1 + net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_netlink.c | 1 + net/netfilter/nf_conntrack_proto_gre.c | 2 ++ net/netfilter/nf_flow_table_ip.c | 2 ++ net/netfilter/nf_flow_table_offload.c | 1 + net/netfilter/nf_flow_table_path.c | 1 + net/netfilter/nf_nat_ovs.c | 3 +++ net/netfilter/nf_nat_proto.c | 1 + net/netfilter/nft_flow_offload.c | 1 + net/sched/act_ct.c | 2 ++ net/sched/act_ctinfo.c | 1 + 13 files changed, 17 insertions(+), 3 deletions(-)
include/linux/netfilter/nf_conntrack_proto_gre.h +0 -3
@@ -1,9 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _CONNTRACK_PROTO_GRE_H #define _CONNTRACK_PROTO_GRE_H -#include <asm/byteorder.h> -#include <net/gre.h> -#include <net/pptp.h> struct nf_ct_gre { unsigned int stream_timeout;
include/net/netfilter/nf_conntrack.h +1 -0
@@ -16,6 +16,7 @@#include <linux/bitops.h> #include <linux/compiler.h> +#include <net/netns/generic.h> #include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tcp.h> #include <linux/netfilter/nf_conntrack_sctp.h>
net/netfilter/nf_conntrack_bpf.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/btf_ids.h> #include <linux/net_namespace.h> +#include <net/sock.h> #include <net/xdp.h> #include <net/netfilter/nf_conntrack_bpf.h> #include <net/netfilter/nf_conntrack_core.h>
net/netfilter/nf_conntrack_netlink.c +1 -0
@@ -32,6 +32,7 @@#include <linux/siphash.h> #include <linux/netfilter.h> +#include <net/ipv6.h> #include <net/netlink.h> #include <net/sock.h> #include <net/netfilter/nf_conntrack.h>
net/netfilter/nf_conntrack_proto_gre.c +2 -0
@@ -33,12 +33,14 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <net/dst.h> +#include <net/gre.h> #include <net/net_namespace.h> #include <net/netns/generic.h> #include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_timeout.h> +#include <net/pptp.h> #include <linux/netfilter/nf_conntrack_proto_gre.h> #include <linux/netfilter/nf_conntrack_pptp.h>
net/netfilter/nf_flow_table_ip.c +2 -0
@@ -8,6 +8,8 @@#include <linux/ipv6.h> #include <linux/netdevice.h> #include <linux/if_ether.h> +#include <linux/if_vlan.h> +#include <net/gre.h> #include <net/gso.h> #include <net/ip.h> #include <net/ipv6.h>
net/netfilter/nf_flow_table_offload.c +1 -0
@@ -6,6 +6,7 @@#include <linux/netdevice.h> #include <linux/tc_act/tc_csum.h> #include <net/flow_offload.h> +#include <net/ip_tunnels.h> #include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_conntrack.h>
net/netfilter/nf_flow_table_path.c +1 -0
@@ -2,6 +2,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/etherdevice.h> #include <linux/netlink.h> #include <linux/netfilter.h> #include <linux/spinlock.h>
net/netfilter/nf_nat_ovs.c +3 -0
@@ -2,6 +2,9 @@/* Support nat functions for openvswitch and used by OVS and TC conntrack. */ #include <net/netfilter/nf_nat.h> +#include <net/ipv6.h> +#include <linux/ip.h> +#include <linux/if_vlan.h> /* Modelled after nf_nat_ipv[46]_fn(). * range is only used for new, uninitialized NAT state.
net/netfilter/nf_nat_proto.c +1 -0
@@ -25,6 +25,7 @@#include <net/ip6_route.h> #include <net/xfrm.h> #include <net/ipv6.h> +#include <net/pptp.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack.h>
net/netfilter/nft_flow_offload.c +1 -0
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0-only +#include <linux/etherdevice.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h>
net/sched/act_ct.c +2 -0
@@ -13,9 +13,11 @@#include <linux/skbuff.h> #include <linux/rtnetlink.h> #include <linux/pkt_cls.h> +#include <linux/if_tunnel.h> #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/rhashtable.h> +#include <net/gre.h> #include <net/netlink.h> #include <net/pkt_sched.h> #include <net/pkt_cls.h>
net/sched/act_ctinfo.c +1 -0
@@ -16,6 +16,7 @@#include <net/pkt_sched.h> #include <net/act_api.h> #include <net/pkt_cls.h> +#include <net/inet_ecn.h> #include <uapi/linux/tc_act/tc_ctinfo.h> #include <net/tc_act/tc_ctinfo.h> #include <net/tc_wrapper.h>
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 7/10 netfilter: nfnetlink_queue: nfqnl_instance GFP_ATOMIC -> GFP_KERNEL_ACCOUNT allocation
In reply to Florian WestphalFrom: Scott Mitchell <[email protected]>
Currently, instance_create() uses GFP_ATOMIC because it's called while holding instances_lock spinlock. This makes allocation more likely to fail under memory pressure.
Refactor nfqnl_recv_config() to drop RCU lock after instance_lookup() and peer_portid verification. A socket cannot simultaneously send a message and close, so the queue owned by the sending socket cannot be destroyed while processing its CONFIG message. This allows instance_create() to allocate with GFP_KERNEL_ACCOUNT before taking the spinlock.
--- net/netfilter/nfnetlink_queue.c | 75 +++++++++++++++------------------ 1 file changed, 34 insertions(+), 41 deletions(-)
net/netfilter/nfnetlink_queue.c +34 -41
@@ -121,17 +121,9 @@ instance_create(struct nfnl_queue_net *q, u_int16_t queue_num, u32 portid)unsigned int h;int err; -spin_lock (&q->instances_lock); -if (instance_lookup (q, queue_num)) { - err = -EEXIST ; - goto out_unlock; - } - - inst =kzalloc (sizeof (*inst),GFP_ATOMIC ); -if (!inst) { - err = -ENOMEM ; - goto out_unlock; - } + inst =kzalloc (sizeof (*inst),GFP_KERNEL_ACCOUNT ); +if (!inst) +return ERR_PTR (-ENOMEM ); inst->queue_num = queue_num; inst->peer_portid = portid;
@@ -141,9 +133,15 @@ instance_create(struct nfnl_queue_net *q, u_int16_t queue_num, u32 portid)spin_lock_init (&inst->lock);INIT_LIST_HEAD (&inst->queue_list); +spin_lock (&q->instances_lock); +if (instance_lookup (q, queue_num)) { + err = -EEXIST ; + goto out_unlock; + } +if (!try_module_get (THIS_MODULE )) { err = -EAGAIN ; - goto out_free; + goto out_unlock; } h =instance_hashfn (queue_num);
@@ -153,10 +151,9 @@ instance_create(struct nfnl_queue_net *q, u_int16_t queue_num, u32 portid)return inst; -out_free: -kfree (inst); out_unlock:spin_unlock (&q->instances_lock); +kfree (inst);return ERR_PTR (err); }
@@ -1498,7 +1495,8 @@ static int nfqnl_recv_config(struct sk_buff *skb, const struct nfnl_info *info,struct nfqnl_msg_config_cmd *cmd =NULL ;struct nfqnl_instance *queue;__u32 flags =0 , mask =0 ; -int ret =0 ; + +WARN_ON_ONCE (!lockdep_nfnl_is_held (NFNL_SUBSYS_QUEUE ));if (nfqa[NFQA_CFG_CMD ]) { cmd =nla_data (nfqa[NFQA_CFG_CMD ]);
@@ -1544,47 +1542,44 @@ static int nfqnl_recv_config(struct sk_buff *skb, const struct nfnl_info *info, } } +/* Lookup queue under RCU. After peer_portid check (or for new queue +* in BIND case), the queue is owned by the socket sending this message. +* A socket cannot simultaneously send a message and close, so while +* processing this CONFIG message, nfqnl_rcv_nl_event() (triggered by +* socket close) cannot destroy this queue. Safe to use without RCU. +*/ rcu_read_lock (); queue =instance_lookup (q, queue_num);if (queue && queue->peer_portid !=NETLINK_CB (skb).portid) { - ret = -EPERM ; - goto err_out_unlock; +rcu_read_unlock (); +return -EPERM ; } +rcu_read_unlock ();if (cmd !=NULL ) {switch (cmd->command) {case NFQNL_CFG_CMD_BIND : -if (queue) { - ret = -EBUSY ; - goto err_out_unlock; - } - queue =instance_create (q, queue_num, -NETLINK_CB (skb).portid); -if (IS_ERR (queue)) { - ret =PTR_ERR (queue); - goto err_out_unlock; - } +if (queue) +return -EBUSY ; + queue =instance_create (q, queue_num,NETLINK_CB (skb).portid); +if (IS_ERR (queue)) +return PTR_ERR (queue);break ;case NFQNL_CFG_CMD_UNBIND : -if (!queue) { - ret = -ENODEV ; - goto err_out_unlock; - } +if (!queue) +return -ENODEV ;instance_destroy (q, queue); - goto err_out_unlock; +return 0 ;case NFQNL_CFG_CMD_PF_BIND :case NFQNL_CFG_CMD_PF_UNBIND :break ;default : - ret = -ENOTSUPP ; - goto err_out_unlock; +return -EOPNOTSUPP ; } } -if (!queue) { - ret = -ENODEV ; - goto err_out_unlock; - } +if (!queue) +return -ENODEV ;if (nfqa[NFQA_CFG_PARAMS ]) { struct nfqnl_msg_config_params *params =
@@ -1609,9 +1604,7 @@ static int nfqnl_recv_config(struct sk_buff *skb, const struct nfnl_info *info,spin_unlock_bh (&queue->lock); } -err_out_unlock: -rcu_read_unlock (); -return ret; +return 0 ; }static const struct nfnl_callback nfqnl_cb[NFQNL_MSG_MAX ] = {
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 8/10 netfilter: nft_compat: add more restrictions on netlink attributes
In reply to Florian WestphalAs far as I can see nothing bad can happen when NFTA_TARGET/MATCH_NAME are too large because this calls x_tables helpers which check for the length, but it seems better to already reject it during netlink parsing.
Rest of the changes avoid silent u8/u16 truncations.
For _TYPE, its expected to be only 1 or 0. In x_tables world, this variable is set by kernel, for IPT_SO_GET_REVISION_TARGET its 1, for all others its set to 0.
As older versions of nf_tables permitted any value except 1 to mean 'match', keep this as-is but sanitize the value for consistency.
--- net/netfilter/nft_compat.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/netfilter/nft_compat.c +10 -3
@@ -134,7 +134,8 @@ static void nft_target_eval_bridge(const struct nft_expr *expr, }static const struct nla_policy nft_target_policy[NFTA_TARGET_MAX +1 ] = { - [NFTA_TARGET_NAME ] = { .type =NLA_NUL_STRING }, + [NFTA_TARGET_NAME ] = { .type =NLA_NUL_STRING , + .len =XT_EXTENSION_MAXNAMELEN , }, [NFTA_TARGET_REV ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_TARGET_INFO ] = { .type =NLA_BINARY }, };
@@ -434,7 +435,8 @@ static void nft_match_eval(const struct nft_expr *expr, }static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX +1 ] = { - [NFTA_MATCH_NAME ] = { .type =NLA_NUL_STRING }, + [NFTA_MATCH_NAME ] = { .type =NLA_NUL_STRING , + .len =XT_EXTENSION_MAXNAMELEN }, [NFTA_MATCH_REV ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_MATCH_INFO ] = { .type =NLA_BINARY }, };
@@ -693,7 +695,12 @@ static int nfnl_compat_get_rcu(struct sk_buff *skb, name =nla_data (tb[NFTA_COMPAT_NAME ]); rev =ntohl (nla_get_be32 (tb[NFTA_COMPAT_REV ])); - target =ntohl (nla_get_be32 (tb[NFTA_COMPAT_TYPE ])); +/* x_tables api checks for 'target == 1' to mean target, +* everything else means 'match'. +* In x_tables world, the number is set by kernel, not +* userspace. +*/ + target =nla_get_be32 (tb[NFTA_COMPAT_TYPE ]) ==htonl (1 );switch (family) {case AF_INET :
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 9/10 netfilter: nf_conncount: fix tracking of connections from localhost
In reply to Florian WestphalFrom: Fernando Fernandez Mancera <[email protected]>
Since commit be102eb6a0e7 ("netfilter: nf_conncount: rework API to use sk_buff directly"), we skip the adding and trigger a GC when the ct is confirmed. For connections originated from local to local it doesn't work because the connection is confirmed on POSTROUTING, therefore tracking on the INPUT hook is always skipped.
In order to fix this, we check whether skb input ifindex is set to loopback ifindex. If it is then we fallback on a GC plus track operation skipping the optimization. This fallback is necessary to avoid duplicated tracking of a packet train e.g 10 UDP datagrams sent on a burst when initiating the connection.
Tested with xt_connlimit/nft_connlimit and OVS limit and with a HTTP server and iperf3 on UDP mode.
--- net/netfilter/nf_conncount.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
net/netfilter/nf_conncount.c +13 -2
@@ -179,14 +179,25 @@ static int __nf_conncount_add(struct net *net,return -ENOENT ;if (ct &&nf_ct_is_confirmed (ct)) { - err = -EEXIST ; - goto out_put; +/* local connections are confirmed in postrouting so confirmation +* might have happened before hitting connlimit +*/ +if (skb->skb_iif !=LOOPBACK_IFINDEX ) { + err = -EEXIST ; + goto out_put; + } + +/* this is likely a local connection, skip optimization to avoid +* adding duplicates from a 'packet train' +*/ + goto check_connections; }if ((u32 )jiffies == list->last_gc && (list->count - list->last_gc_count) <CONNCOUNT_GC_MAX_COLLECT ) goto add_new_node; +check_connections:/* check the saved connections */ list_for_each_entry_safe (conn, conn_n, &list->head, node) {if (collect >CONNCOUNT_GC_MAX_COLLECT )
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 10/10 netfilter: xt_tcpmss: check remaining length before reading optlen
In reply to Florian WestphalQuoting reporter:
In net/netfilter/xt_tcpmss.c (lines 53-68), the TCP option parser reads
op[i+1] directly without validating the remaining option length.
If the last byte of the option field is not EOL/NOP (0/1), the code attempts to index op[i+1]. In the case where i + 1 == optlen, this causes an out-of-bounds read, accessing memory past the optlen boundary (either reading beyond the stack buffer _opt or the
following payload).
--- net/netfilter/xt_tcpmss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_tcpmss.c +1 -1
@@ -61,7 +61,7 @@ tcpmss_mt(const struct sk_buff *skb, struct xt_action_param *par)return (mssval >= info->mss_min && mssval <= info->mss_max) ^ info->invert; } -if (op[i] <2 ) +if (op[i] <2 || i == optlen -1 ) i++;else i += op[i+1 ] ? :1 ;
Signature · 1 line
2.52.0