Netfilter/IPVS fixes for net
Subsystems (6)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS fixes for net
Hi,
The following patchset contains Netfilter/IPVS fixes for net. Still large batch for this late -rc cycle but at least have of these fixes in this batch have been cooking for several weeks before:
1) Fix race between ipset list:set GC and swap, use write_lock instead of rcu read lock section when accessing the index to ensure interference with ip_set_swap(), from Xiang Mei.
2) Release template conntrack in bridge conntrack when packet is neither IPv4 nor IPv6 before setting skb as untracked. From Zhiling Zou.
3) A series of 3 patches for IPVS to address sashiko reports:
Schedulers read destination overload state while connection accounting and destination configuration can update it concurrently. The first patch adds a single total connection counter. The second patch uses it to identify threshold crossings precisely, and updates OVERLOAD at the crossings and on a threshold edit under dst_lock. The third patch moves configuration-controlled AVAILABLE to a separate cflags word, so it cannot clobber OVERLOAD through an unrelated read-modify-write update.
4) Log invalid packets in TCP and SCTP connection tracking to address a deadlock when nfnetlink_log is used as logging backend and the nfnetlink_log conntrack glue support is used. From Zihan Xi.
5) Wait for rcu grace period before releasing pernet state in nfnetlink_log, otherwise packets can end up access already released memory, triggering UaF. From Florian Westphal.
6) IPVS needs to reset IP information in control buffer in skbuff when encapsulating IP packets in ICMP, from Kyle Zeng.
7) IPVS needs to validate ihl field of inner headers in when handling ICMP response, from Julian Anastasov.
8) Remove a WARN_ON_ONCE reachable from the nf_tables hardware offload when triggering ENOMEM on GFP_KERNEL allocation,
from Alexey Velichayshiy.
9) Publish reply tuple into the flowtable hashtable first, otherwise GC might walk over a released tuple when insertion of the original tuple fail. From Jeremy Jean.
10) Elide counter increment when replacing an ipset element, from Florian Westphal.
11) Remove unneeded ipset accounting resets on destruction/flush, from Florian Westphal.
Sashiko reports pre-existing 8-bit shift and overflow in IPVS which is planned to be addressed as follow ups.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-26-08-10
Thanks.
----------------------------------------------------------------
The following changes since commit dd057113ac7ba5bdd2aed3d9405305911152f911:
mailmap: add entries for Christoph Paasch (2026-08-07 18:20:12 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-26-08-10
for you to fetch changes up to 490937b88cb592cc0c5367758edd700fd5abd15c:
netfilter: ipset: let destroy callbacks adjust ext mem size (2026-08-10 20:28:25 +0200)
----------------------------------------------------------------
netfilter pull request 26-08-10
----------------------------------------------------------------
Alexey Velichayshiy (1):
netfilter: nf_tables_offload: suppress WARN_ON_ONCE for ENOMEM in abort path
Florian Westphal (3):
netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state
netfilter: ipset: fix list type element drift bug
netfilter: ipset: let destroy callbacks adjust ext mem size
Julian Anastasov (3):
ipvs: add totalconns for dest
ipvs: properly update the overload flag on dest edit
ipvs: revalidate ihl to prevent out-of-bounds access
Jérémy Jean (1):
netfilter: flowtable: publish GC-visible tuple last
Kyle Zeng (1):
ipvs: clear IPv4 options after rebasing tunnel ICMP errors
Xiang Mei (Microsoft) (1):
netfilter: ipset: fix refcount race between list:set GC and swap
Yizhou Zhao (1):
ipvs: separate destination availability state
Zhiling Zou (1):
netfilter: bridge: release template ct on non-IP path
Zihan Xi (1):
netfilter: nf_conntrack: defer invalid log until after unlock
include/net/ip_vs.h | 29 +++++-- include/uapi/linux/ip_vs.h | 6 -- net/bridge/netfilter/nf_conntrack_bridge.c | 1 + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- net/netfilter/ipset/ip_set_core.c | 19 +++-- net/netfilter/ipset/ip_set_list_set.c | 10 ++- net/netfilter/ipvs/ip_vs_conn.c | 45 +++------- net/netfilter/ipvs/ip_vs_core.c | 18 ++-- net/netfilter/ipvs/ip_vs_ctl.c | 81 ++++++++++++++---- net/netfilter/ipvs/ip_vs_dh.c | 4 +- net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 8 +- net/netfilter/ipvs/ip_vs_lc.c | 4 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 - net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 - net/netfilter/ipvs/ip_vs_sync.c | 7 +- net/netfilter/ipvs/ip_vs_xmit.c | 7 +- net/netfilter/nf_conntrack_proto.c | 6 ++ net/netfilter/nf_conntrack_proto_sctp.c | 12 ++- net/netfilter/nf_conntrack_proto_tcp.c | 132 +++++++++++++++++++---------- net/netfilter/nf_flow_table_core.c | 7 +- net/netfilter/nf_log_syslog.c | 4 +- net/netfilter/nf_tables_offload.c | 2 +- net/netfilter/nfnetlink_log.c | 13 ++- 24 files changed, 270 insertions(+), 153 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/13 netfilter: ipset: fix refcount race between list:set GC and swap
From: "Xiang Mei (Microsoft)" <[email protected]>
__ip_set_put_byindex() resolved the index to a set pointer under RCU, then took ip_set_ref_lock in __ip_set_put() to decrement set->ref. ip_set_swap() holds that same lock while swapping both the ip_set_list slots and the two sets' ref counters, so it can interleave between the dereference and the lock acquisition, leaving the caller to decrement a set whose reference already moved to the other index and hit BUG_ON(set->ref == 0). list_set_gc() reaches this from timer softirq, which the nfnl mutex does not serialize against swap: an expiring list:set member calls list_set_del() -> ip_set_put_byindex() while IPSET_CMD_SWAP runs on the referenced sets.
Resolve the index and decrement under ip_set_ref_lock, as ip_set_swap() already does, keeping the refcount tied to the index rather than to a stale set pointer.
kernel BUG at net/netfilter/ipset/ip_set_core.c:685!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ip_set_put_byindex (net/netfilter/ipset/ip_set_core.c:870) Call Trace: <IRQ> list_set_del (net/netfilter/ipset/ip_set_list_set.c:159) set_cleanup_entries (net/netfilter/ipset/ip_set_list_set.c:181) list_set_gc (net/netfilter/ipset/ip_set_list_set.c:578) call_timer_fn (kernel/time/timer.c:1748) __run_timers (kernel/time/timer.c:1799 kernel/time/timer.c:2374) run_timer_softirq (kernel/time/timer.c:2405) </IRQ> Kernel panic - not syncing: Fatal exception in interrupt
--- net/netfilter/ipset/ip_set_core.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
net/netfilter/ipset/ip_set_core.c +13 -6
@@ -680,11 +680,18 @@ __ip_set_get(struct ip_set *set) }static void -__ip_set_put (struct ip_set *set) +__ip_set_put_locked (struct ip_set *set) { -write_lock_bh (&ip_set_ref_lock); +lockdep_assert_held (&ip_set_ref_lock);BUG_ON (set->ref ==0 ); set->ref--; +} + +static void +__ip_set_put (struct ip_set *set) +{ +write_lock_bh (&ip_set_ref_lock); +__ip_set_put_locked (set);write_unlock_bh (&ip_set_ref_lock); }
@@ -855,11 +862,11 @@ __ip_set_put_byindex(struct ip_set_net *inst, ip_set_id_t index) {struct ip_set *set; -rcu_read_lock (); - set =rcu_dereference (inst->ip_set_list)[index]; +write_lock_bh (&ip_set_ref_lock); + set =ip_set (inst, index);if (set) -__ip_set_put (set); -rcu_read_unlock (); +__ip_set_put_locked (set); +write_unlock_bh (&ip_set_ref_lock); }void
Signature · 1 line
2.47.3
Re: [PATCH net 01/13] netfilter: ipset: fix refcount race between list:set GC and swap
This series was applied to netdev/net.git (main) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Pablo Neira Ayuso <[email protected]>:
Quoted 13 lines · On Mon, 10 Aug 2026 21:06:09 +0200 you wrote:
From: "Xiang Mei (Microsoft)" <[email protected]>
__ip_set_put_byindex()resolved the index to a set pointer under RCU, then tookip_set_ref_lockin__ip_set_put()to decrementset->ref.ip_set_swap()holds that same lock while swapping both theip_set_listslots and the two sets' ref counters, so it can interleave between the dereference and the lock acquisition, leaving the caller to decrement a set whose reference already moved to the other index and hitBUG_ON(set->ref == 0).list_set_gc()reaches this from timer softirq, which the nfnl mutex does not serialize against swap: an expiring list:set member callslist_set_del()->ip_set_put_byindex()whileIPSET_CMD_SWAPruns on the referenced sets.
Quoted 1 line
[...]
Here is the summary with links:
- [net,01/13] netfilter: ipset: fix refcount race between list:set GC and swap
https://git.kernel.org/netdev/net/c/0c8886827165 - [net,02/13] netfilter: bridge: release template ct on non-IP path https://git.kernel.org/netdev/net/c/d45cc8020d7c - [net,03/13] ipvs: add totalconns for dest https://git.kernel.org/netdev/net/c/04d2feaed8d0 - [net,04/13] ipvs: properly update the overload flag on dest edit https://git.kernel.org/netdev/net/c/8f843441c4e7 - [net,05/13] ipvs: separate destination availability state https://git.kernel.org/netdev/net/c/cdcc4e46180d - [net,06/13] netfilter: nf_conntrack: defer invalid log until after unlock https://git.kernel.org/netdev/net/c/2d19b95c9723 - [net,07/13] netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state https://git.kernel.org/netdev/net/c/33d1469b0124 - [net,08/13] ipvs: clear IPv4 options after rebasing tunnel ICMP errors https://git.kernel.org/netdev/net/c/e0ba936287df - [net,09/13] ipvs: revalidate ihl to prevent out-of-bounds access https://git.kernel.org/netdev/net/c/d93660df4dd1 - [net,10/13] netfilter: nf_tables_offload: suppress WARN_ON_ONCE for ENOMEM in abort path https://git.kernel.org/netdev/net/c/d02f59206434 - [net,11/13] netfilter: flowtable: publish GC-visible tuple last https://git.kernel.org/netdev/net/c/2014ac62df9d - [net,12/13] netfilter: ipset: fix list type element drift bug https://git.kernel.org/netdev/net/c/4cbd69766b35 - [net,13/13] netfilter: ipset: let destroy callbacks adjust ext mem size https://git.kernel.org/netdev/net/c/490937b88cb5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/13 netfilter: bridge: release template ct on non-IP path
In reply to Pablo Neira AyusoFrom: Zhiling Zou <[email protected]>
A bridge nftables ct zone set rule can attach a conntrack template to an skb before nf_ct_bridge_pre() sees it. For non-IPv4 and non-IPv6 EtherTypes, nf_ct_bridge_pre() currently overwrites skb->_nfct with IP_CT_UNTRACKED without releasing the existing template reference.
That makes the per-cpu template, and any temporary templates allocated for concurrent use, unreachable and leaks memory until the host runs out of slab.
Reset the skb conntrack state before marking the frame untracked so the existing template reference is dropped on the non-IP path.
--- net/bridge/netfilter/nf_conntrack_bridge.c | 1 + 1 file changed, 1 insertion(+)
net/bridge/netfilter/nf_conntrack_bridge.c +1 -0
@@ -280,6 +280,7 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, ret =nf_ct_br_defrag6 (skb, &bridge_state);break ;default : +nf_reset_ct (skb);nf_ct_set (skb,NULL ,IP_CT_UNTRACKED );return NF_ACCEPT ; }
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 3/13 ipvs: add totalconns for dest
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
Replace the inactconns dest counter with totalconns, now inactconns can be obtained from totalconns - activeconns. This reduces the atomic inc/dec ops for TCP/SCTP from 6 to 4 if the connection is established and then closed.
--- include/net/ip_vs.h | 17 ++++++++++++----- net/netfilter/ipvs/ip_vs_conn.c | 24 +++++++----------------- net/netfilter/ipvs/ip_vs_ctl.c | 10 +++++----- net/netfilter/ipvs/ip_vs_lc.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 -- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 -- net/netfilter/ipvs/ip_vs_sync.c | 7 ++----- 7 files changed, 28 insertions(+), 38 deletions(-)
include/net/ip_vs.h +12 -5
@@ -987,7 +987,7 @@ struct ip_vs_dest {/* connection counters and thresholds */ atomic_t activeconns;/* active connections */ -atomic_t inactconns;/* inactive connections */ +atomic_t totalconns;/* total connections */ atomic_t persistconns;/* persistent connections */ __u32 u_threshold;/* upper threshold */ __u32 l_threshold;/* lower threshold */
@@ -2220,14 +2220,21 @@ void ip_vs_unregister_hooks(struct netns_ipvs *ipvs, unsigned int af);static inline int ip_vs_dest_conn_overhead (struct ip_vs_dest *dest) { -/* We think the overhead of processing active connections is 256 +/* We think the overhead of processing active connections is 257 * times higher than that of inactive connections in average. (This -* 256 times might not be accurate, we will change it later) We +* 257 times might not be accurate, we will change it later) We * use the following formula to estimate the overhead now: -* dest->activeconns*256 + dest->inactconns +* dest->activeconns*256 + dest->totalconns */ return (atomic_read (&dest->activeconns) <<8 ) + -atomic_read (&dest->inactconns); +atomic_read (&dest->totalconns); +} + +static inline int +ip_vs_dest_inactconns (const struct ip_vs_dest *dest) +{ +return max (atomic_read (&dest->totalconns) - +atomic_read (&dest->activeconns),0 ); }#ifdef CONFIG_IP_VS_PROTO_TCP
net/netfilter/ipvs/ip_vs_conn.c +7 -17
@@ -1081,12 +1081,6 @@ static inline void ip_vs_bind_xmit_v6(struct ip_vs_conn *cp)#endif -static inline int ip_vs_dest_totalconns (struct ip_vs_dest *dest) -{ -return atomic_read (&dest->activeconns) - +atomic_read (&dest->inactconns); -} -/* * Bind a connection entry with a virtual service destination * Called just after a new connection entry is created.
@@ -1153,8 +1147,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)*/ if (!(flags &IP_VS_CONN_F_INACTIVE ))atomic_inc (&dest->activeconns); -else -atomic_inc (&dest->inactconns); +atomic_inc (&dest->totalconns); }else {/* It is a persistent connection/template, so increase the persistent connection counter */
@@ -1162,7 +1155,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest) }if (dest->u_threshold !=0 && -ip_vs_dest_totalconns (dest) >= dest->u_threshold) +atomic_read (&dest->totalconns) >= dest->u_threshold) dest->flags |=IP_VS_DEST_F_OVERLOAD ; }
@@ -1244,13 +1237,10 @@ static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp)/* Update the connection counters */ if (!(cp->flags &IP_VS_CONN_F_TEMPLATE )) { -/* It is a normal connection, so decrease the inactconns -or activeconns counter */ -if (cp->flags &IP_VS_CONN_F_INACTIVE ) { -atomic_dec (&dest->inactconns); - }else { +/* It is a normal connection, so decrease the counters */ +if (!(cp->flags &IP_VS_CONN_F_INACTIVE ))atomic_dec (&dest->activeconns); - } +atomic_dec (&dest->totalconns); }else {/* It is a persistent connection/template, so decrease the persistent connection counter */
@@ -1258,10 +1248,10 @@ static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp) }if (dest->l_threshold !=0 ) { -if (ip_vs_dest_totalconns (dest) < dest->l_threshold) +if (atomic_read (&dest->totalconns) < dest->l_threshold) dest->flags &= ~IP_VS_DEST_F_OVERLOAD ; }else if (dest->u_threshold !=0 ) { -if (ip_vs_dest_totalconns (dest) *4 < dest->u_threshold *3 ) +if (atomic_read (&dest->totalconns) *4 < dest->u_threshold *3 ) dest->flags &= ~IP_VS_DEST_F_OVERLOAD ; }else {if (dest->flags &IP_VS_DEST_F_OVERLOAD )
net/netfilter/ipvs/ip_vs_ctl.c +5 -5
@@ -1445,7 +1445,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) dest->port = udest->port;atomic_set (&dest->activeconns,0 ); -atomic_set (&dest->inactconns,0 ); +atomic_set (&dest->totalconns,0 );atomic_set (&dest->persistconns,0 );refcount_set (&dest->refcnt,1 );
@@ -3031,7 +3031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)ip_vs_fwd_name (atomic_read (&dest->conn_flags)),atomic_read (&dest->weight),atomic_read (&dest->activeconns), - atomic_read(&dest->inactconns)); + ip_vs_dest_inactconns(dest)); else #endif seq_printf(seq,
@@ -3042,7 +3042,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)ip_vs_fwd_name (atomic_read (&dest->conn_flags)),atomic_read (&dest->weight),atomic_read (&dest->activeconns), - atomic_read(&dest->inactconns)); + ip_vs_dest_inactconns(dest)); } }
@@ -3670,7 +3670,7 @@ __ip_vs_get_dest_entries(struct netns_ipvs *ipvs, const struct ip_vs_get_dests * entry.u_threshold = dest->u_threshold; entry.l_threshold = dest->l_threshold; entry.activeconns =atomic_read (&dest->activeconns); - entry.inactconns =atomic_read (&dest->inactconns); + entry.inactconns =ip_vs_dest_inactconns (dest); entry.persistconns =atomic_read (&dest->persistconns);ip_vs_copy_stats (&kstats, &dest->stats);ip_vs_export_stats_user (&entry.stats, &kstats);
@@ -4282,7 +4282,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)nla_put_u32 (skb,IPVS_DEST_ATTR_ACTIVE_CONNS ,atomic_read (&dest->activeconns)) ||nla_put_u32 (skb,IPVS_DEST_ATTR_INACT_CONNS , -atomic_read (&dest->inactconns)) || +ip_vs_dest_inactconns (dest)) ||nla_put_u32 (skb,IPVS_DEST_ATTR_PERSIST_CONNS ,atomic_read (&dest->persistconns)) || nla_put_u16(skb, IPVS_DEST_ATTR_ADDR_FAMILY, dest->af))
net/netfilter/ipvs/ip_vs_lc.c +2 -2
@@ -30,7 +30,7 @@ ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,/* * Simply select the server with the least number of -* (activeconns<<5) + inactconns +* (activeconns*256) + totalconns * Except whose weight is equal to zero. * If the weight is equal to zero, it means that the server is * quiesced, the existing connections to the server still get
@@ -56,7 +56,7 @@ ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,IP_VS_DBG_ADDR (least->af, &least->addr),ntohs (least->port),atomic_read (&least->activeconns), - atomic_read(&least->inactconns)); + ip_vs_dest_inactconns(least));return least; }
net/netfilter/ipvs/ip_vs_proto_sctp.c +0 -2
@@ -446,12 +446,10 @@ set_sctp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp,if (!(cp->flags &IP_VS_CONN_F_INACTIVE ) && (next_state !=IP_VS_SCTP_S_ESTABLISHED )) {atomic_dec (&dest->activeconns); -atomic_inc (&dest->inactconns); cp->flags |=IP_VS_CONN_F_INACTIVE ; }else if ((cp->flags &IP_VS_CONN_F_INACTIVE ) && (next_state ==IP_VS_SCTP_S_ESTABLISHED )) {atomic_inc (&dest->activeconns); -atomic_dec (&dest->inactconns); cp->flags &= ~IP_VS_CONN_F_INACTIVE ; } }
net/netfilter/ipvs/ip_vs_proto_tcp.c +0 -2
@@ -526,12 +526,10 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp,if (!(cp->flags &IP_VS_CONN_F_INACTIVE ) && !tcp_state_active (new_state)) {atomic_dec (&dest->activeconns); -atomic_inc (&dest->inactconns); cp->flags |=IP_VS_CONN_F_INACTIVE ; }else if ((cp->flags &IP_VS_CONN_F_INACTIVE ) &&tcp_state_active (new_state)) {atomic_inc (&dest->activeconns); -atomic_dec (&dest->inactconns); cp->flags &= ~IP_VS_CONN_F_INACTIVE ; } }
net/netfilter/ipvs/ip_vs_sync.c +2 -5
@@ -878,13 +878,10 @@ static void ip_vs_proc_conn(struct netns_ipvs *ipvs, struct ip_vs_conn_param *paspin_lock_bh (&cp->lock);if ((cp->flags ^ flags) &IP_VS_CONN_F_INACTIVE && !(flags &IP_VS_CONN_F_TEMPLATE ) && dest) { -if (flags &IP_VS_CONN_F_INACTIVE ) { +if (flags &IP_VS_CONN_F_INACTIVE )atomic_dec (&dest->activeconns); -atomic_inc (&dest->inactconns); - }else { +else atomic_inc (&dest->activeconns); -atomic_dec (&dest->inactconns); - } } flags &=IP_VS_CONN_F_BACKUP_UPD_MASK ; flags |= cp->flags & ~IP_VS_CONN_F_BACKUP_UPD_MASK ;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 4/13 ipvs: properly update the overload flag on dest edit
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
The upper/lower connection thresholds for dest can be changed, so use ip_vs_dest_update_overload() to properly update the dest overload flag.
The thresholds were not limited, fit them in the 0 .. INT_MAX range as already done in ipvsadm.
As the thresholds are also read when connections are created and expired, use WRITE_ONCE/READ_ONCE to access them.
As the lower threshold is optional, use (u - (u >> 2)) to calculate the 75% default value based on the upper threshold by preserving the integer rounding, as suggested by Yizhou Zhao.
Trigger flag update when totalconns reaches one of the thresholds and use dst_lock to serialize the updating.
--- include/net/ip_vs.h | 3 ++ net/netfilter/ipvs/ip_vs_conn.c | 27 +++++-------- net/netfilter/ipvs/ip_vs_ctl.c | 67 +++++++++++++++++++++++++++++---- 3 files changed, 72 insertions(+), 25 deletions(-)
include/net/ip_vs.h +3 -0
@@ -991,6 +991,7 @@ struct ip_vs_dest {atomic_t persistconns;/* persistent connections */ __u32 u_threshold;/* upper threshold */ __u32 l_threshold;/* lower threshold */ +__u32 l_threshold_val;/* used lower threshold */ /* for destination cache */ spinlock_t dst_lock;/* lock of dst_cache */
@@ -1907,6 +1908,8 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest)kfree (dest); } +void ip_vs_dest_update_overload (struct ip_vs_dest *dest,int mode); +/* IPVS sync daemon data and function prototypes * (from ip_vs_sync.c) */
net/netfilter/ipvs/ip_vs_conn.c +10 -17
@@ -1141,22 +1141,22 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)/* Update the connection counters */ if (!(flags &IP_VS_CONN_F_TEMPLATE )) { +int tc; +/* It is a normal connection, so modify the counters * according to the flags, later the protocol can * update them on state change */ if (!(flags &IP_VS_CONN_F_INACTIVE ))atomic_inc (&dest->activeconns); -atomic_inc (&dest->totalconns); + tc =atomic_inc_return (&dest->totalconns); +if (tc ==READ_ONCE (dest->u_threshold)) +ip_vs_dest_update_overload (dest,1 ); }else {/* It is a persistent connection/template, so increase the persistent connection counter */ atomic_inc (&dest->persistconns); } - -if (dest->u_threshold !=0 && -atomic_read (&dest->totalconns) >= dest->u_threshold) - dest->flags |=IP_VS_DEST_F_OVERLOAD ; }
@@ -1237,27 +1237,20 @@ static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp)/* Update the connection counters */ if (!(cp->flags &IP_VS_CONN_F_TEMPLATE )) { +int tc; +/* It is a normal connection, so decrease the counters */ if (!(cp->flags &IP_VS_CONN_F_INACTIVE ))atomic_dec (&dest->activeconns); -atomic_dec (&dest->totalconns); + tc =atomic_fetch_dec (&dest->totalconns); +if (tc ==READ_ONCE (dest->l_threshold_val)) +ip_vs_dest_update_overload (dest,-1 ); }else {/* It is a persistent connection/template, so decrease the persistent connection counter */ atomic_dec (&dest->persistconns); } -if (dest->l_threshold !=0 ) { -if (atomic_read (&dest->totalconns) < dest->l_threshold) - dest->flags &= ~IP_VS_DEST_F_OVERLOAD ; - }else if (dest->u_threshold !=0 ) { -if (atomic_read (&dest->totalconns) *4 < dest->u_threshold *3 ) - dest->flags &= ~IP_VS_DEST_F_OVERLOAD ; - }else { -if (dest->flags &IP_VS_DEST_F_OVERLOAD ) - dest->flags &= ~IP_VS_DEST_F_OVERLOAD ; - } -ip_vs_dest_put (dest); }
net/netfilter/ipvs/ip_vs_ctl.c +59 -8
103 lines not on this page · raw message
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 5/13 ipvs: separate destination availability state
In reply to Pablo Neira AyusoFrom: Yizhou Zhao <[email protected]>
IPVS configuration paths update destination availability while connection accounting updates destination overload state. The two independent states share dest->flags, so their read-modify-write updates can race and lose one another.
Keep OVERLOAD in flags, where the preceding patch serializes its updates with dst_lock, and move AVAILABLE to cflags. This keeps configuration- controlled availability out of the scheduler hot cacheline until a scheduler needs to check it. It also prevents availability updates from clobbering overload state.
The destination status bits are not exposed through the IPVS sockopt or netlink interfaces, so keep their definitions in the internal IPVS header.
Readers can still observe stale destination state; this does not provide a cross-field snapshot.
--- include/net/ip_vs.h | 7 +++++++ include/uapi/linux/ip_vs.h | 6 ------ net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_dh.c | 4 ++-- net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 8 ++++---- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 9 files changed, 23 insertions(+), 22 deletions(-)
include/net/ip_vs.h +7 -0
@@ -36,6 +36,12 @@#define IP_VS_HDR_INVERSE 1#define IP_VS_HDR_ICMP 2 +/* Destination Server Flags */ +#define IP_VS_DEST_F_OVERLOAD 0x0002/* server is overloaded */ + +/* Destination Server Config Flags */ +#define IP_VS_DEST_CF_AVAILABLE 0x0001/* server is available */ +/* conn_tab limits (as per Kconfig) */ #define IP_VS_CONN_TAB_MIN_BITS 8#if BITS_PER_LONG >32
@@ -976,6 +982,7 @@ struct ip_vs_dest {volatile unsigned int flags;/* dest status flags */ atomic_t conn_flags;/* flags to copy to conn */ atomic_t weight;/* server weight */ +unsigned long cflags;/* config flags */ atomic_t last_weight;/* server latest weight */ __u16 tun_type;/* tunnel type */ __be16 tun_port;/* tunnel port */
include/uapi/linux/ip_vs.h +0 -6
@@ -28,12 +28,6 @@#define IP_VS_SVC_F_SCHED_SH_FALLBACK IP_VS_SVC_F_SCHED1/* SH fallback */ #define IP_VS_SVC_F_SCHED_SH_PORT IP_VS_SVC_F_SCHED2/* SH use port */ -/* -* Destination Server Flags -*/ -#define IP_VS_DEST_F_AVAILABLE 0x0001/* server is available */ -#define IP_VS_DEST_F_OVERLOAD 0x0002/* server is overloaded */ -/* * IPVS sync daemon states */
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -1279,7 +1279,7 @@ int ip_vs_check_template(struct ip_vs_conn *ct, struct ip_vs_dest *cdest)* Checking the dest server status. */ if ((dest ==NULL ) || - !(dest->flags &IP_VS_DEST_F_AVAILABLE ) || + !(dest->cflags &IP_VS_DEST_CF_AVAILABLE ) ||expire_quiescent_template (ipvs, dest) || (cdest && (dest != cdest))) { IP_VS_DBG_BUF(9, "check_template: dest not available for "
@@ -2020,7 +2020,7 @@ void ip_vs_expire_nodest_conn_flush(struct netns_ipvs *ipvs) cp =ip_vs_hn0_to_conn (hn); resched_score++; dest = cp->dest; -if (!dest || (dest->flags &IP_VS_DEST_F_AVAILABLE )) +if (!dest || (dest->cflags &IP_VS_DEST_CF_AVAILABLE ))continue ;if (atomic_read (&cp->n_control))
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -302,7 +302,7 @@ ip_vs_in_stats(struct ip_vs_conn *cp, struct sk_buff *skb)struct ip_vs_dest *dest = cp->dest;struct netns_ipvs *ipvs = cp->ipvs; -if (dest && (dest->flags &IP_VS_DEST_F_AVAILABLE )) { +if (dest && (dest->cflags &IP_VS_DEST_CF_AVAILABLE )) {struct ip_vs_cpu_stats *s;struct ip_vs_service *svc;
@@ -338,7 +338,7 @@ ip_vs_out_stats(struct ip_vs_conn *cp, struct sk_buff *skb)struct ip_vs_dest *dest = cp->dest;struct netns_ipvs *ipvs = cp->ipvs; -if (dest && (dest->flags &IP_VS_DEST_F_AVAILABLE )) { +if (dest && (dest->cflags &IP_VS_DEST_CF_AVAILABLE )) {struct ip_vs_cpu_stats *s;struct ip_vs_service *svc;
@@ -2210,7 +2210,7 @@ ip_vs_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state }/* Check the server status */ -if (cp && cp->dest && !(cp->dest->flags &IP_VS_DEST_F_AVAILABLE )) { +if (cp && cp->dest && !(cp->dest->cflags &IP_VS_DEST_CF_AVAILABLE )) {/* the destination server is not available */ if (sysctl_expire_nodest_conn (ipvs)) {bool old_ct =ip_vs_conn_uses_old_conntrack (cp, skb);
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -1402,7 +1402,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, }/* set the dest status flags */ - dest->flags |=IP_VS_DEST_F_AVAILABLE ; + dest->cflags |=IP_VS_DEST_CF_AVAILABLE ;if (READ_ONCE (dest->u_threshold) != udest->u_threshold ||READ_ONCE (dest->l_threshold) != udest->l_threshold) {
@@ -1662,7 +1662,7 @@ static void __ip_vs_unlink_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, int svcupd) { - dest->flags &= ~IP_VS_DEST_F_AVAILABLE ; + dest->cflags &= ~IP_VS_DEST_CF_AVAILABLE ;spin_lock_bh (&dest->dst_lock);__ip_vs_dst_cache_reset (dest);
net/netfilter/ipvs/ip_vs_dh.c +2 -2
@@ -219,8 +219,8 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, s = (struct ip_vs_dh_state *) svc->sched_data; dest =ip_vs_dh_get (svc->af, s, &iph->daddr); -if (!dest - || !(dest->flags &IP_VS_DEST_F_AVAILABLE ) +if (!dest || + !(dest->cflags &IP_VS_DEST_CF_AVAILABLE ) ||atomic_read (&dest->weight) <=0 ||is_overloaded (dest)) {ip_vs_scheduler_err (svc,"no destination available" );
net/netfilter/ipvs/ip_vs_lblc.c +1 -1
@@ -502,7 +502,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,*/ dest = en->dest; -if ((dest->flags &IP_VS_DEST_F_AVAILABLE ) && +if ((dest->cflags &IP_VS_DEST_CF_AVAILABLE ) &&atomic_read (&dest->weight) >0 && !is_overloaded (dest, svc)) goto out; }
net/netfilter/ipvs/ip_vs_lblcr.c +4 -4
@@ -169,8 +169,8 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)if (least->flags &IP_VS_DEST_F_OVERLOAD )continue ; -if ((atomic_read (&least->weight) >0 ) - && (least->flags &IP_VS_DEST_F_AVAILABLE )) { +if ((atomic_read (&least->weight) >0 ) && + (least->cflags &IP_VS_DEST_CF_AVAILABLE )) { loh =ip_vs_dest_conn_overhead (least); goto nextstage; }
@@ -186,8 +186,8 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set) doh =ip_vs_dest_conn_overhead (dest);if (((__s64 )loh *atomic_read (&dest->weight) > - (__s64 )doh *atomic_read (&least->weight)) - && (dest->flags &IP_VS_DEST_F_AVAILABLE )) { + (__s64 )doh *atomic_read (&least->weight)) && + (dest->cflags &IP_VS_DEST_CF_AVAILABLE )) { least = dest; loh = doh; }
net/netfilter/ipvs/ip_vs_xmit.c +2 -2
@@ -351,7 +351,7 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,* stored in dest_trash. */ if (!rt_dev_is_down (dst_dev_rcu (&rt->dst)) && - dest->flags &IP_VS_DEST_F_AVAILABLE ) + dest->cflags &IP_VS_DEST_CF_AVAILABLE )__ip_vs_dst_set (dest, dest_dst, &rt->dst,0 );else noref =0 ;
@@ -530,7 +530,7 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,* stored in dest_trash. */ if (!rt_dev_is_down (dst_dev_rcu (&rt->dst)) && - dest->flags &IP_VS_DEST_F_AVAILABLE ) + dest->cflags &IP_VS_DEST_CF_AVAILABLE )__ip_vs_dst_set (dest, dest_dst, &rt->dst, cookie);else noref =0 ;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 6/13 netfilter: nf_conntrack: defer invalid log until after unlock
In reply to Pablo Neira AyusoFrom: Zihan Xi <[email protected]>
TCP and SCTP conntrack paths can emit invalid-packet logs while ct->lock is still held.
When invalid logging is routed to nfnetlink_log and conntrack export is enabled, the log path can re-enter conntrack netlink glue and dump the same conntrack again. Protocol attribute dumping may take ct->lock, so logging while holding that lock can deadlock.
Defer the TCP invalid logs by storing only the minimal log context while ct->lock is held and emitting the log after unlocking. Also make the TCP timeout-lowering invalid path return whether a log is needed, then emit that log after unlocking.
Do the same for the SCTP invalid state-transition log that can be reached while ct->lock is held.
Add a lockdep assertion to nf_ct_l4proto_log_invalid() so future callers that log invalid conntracks while holding ct->lock are caught outside TCP and SCTP as well.
--- net/netfilter/nf_conntrack_proto.c | 6 ++ net/netfilter/nf_conntrack_proto_sctp.c | 12 ++- net/netfilter/nf_conntrack_proto_tcp.c | 132 ++++++++++++++++-------- 3 files changed, 102 insertions(+), 48 deletions(-)
net/netfilter/nf_conntrack_proto.c +6 -0
@@ -79,6 +79,12 @@ void nf_ct_l4proto_log_invalid(const struct sk_buff *skb,struct net *net;va_list args; +/* nfnetlink_log may re-enter conntrack attribute dumping and try to +* take ct->lock again via helpers such as tcp_to_nlattr(), so invalid +* conntrack logs must only be emitted after dropping ct->lock. +*/ +lockdep_assert_not_held (&ct->lock); + net =nf_ct_net (ct);if (likely (net->ct.sysctl_log_invalid ==0 ))return ;
net/netfilter/nf_conntrack_proto_sctp.c +8 -4
@@ -336,10 +336,12 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct,struct sctphdr _sctph;const struct sctp_chunkhdr *sch;struct sctp_chunkhdr _sch; +bool log_invalid = false;u_int32_t offset, count;unsigned int *timeouts;unsigned long map[256 /sizeof (unsigned long )] = {0 };bool ignore = false; +u8 invalid_type =0 ;if (sctp_error (skb, dataoff, state))return -NF_ACCEPT ;
@@ -451,10 +453,8 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct,/* Invalid */ if (new_state ==SCTP_CONNTRACK_MAX ) { -nf_ct_l4proto_log_invalid (skb, ct, state, -"Invalid, old_state %d, dir %d, type %d" , - old_state, dir, sch->type); - + log_invalid = true; + invalid_type = sch->type; goto out_unlock; }
@@ -529,6 +529,10 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct, out_unlock:spin_unlock_bh (&ct->lock); +if (log_invalid) +nf_ct_l4proto_log_invalid (skb, ct, state, +"Invalid, old_state %d, dir %d, type %d" , + old_state, dir, invalid_type); out:return -NF_ACCEPT ; }
net/netfilter/nf_conntrack_proto_tcp.c +88 -44
225 lines not on this page · raw message
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 7/13 netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
sashiko reports: "nfnl_log_net_exit() calls nf_log_unset(), which clears the logger pointer without an RCU grace period. Immediately after, ops_free_list() frees the per-net state while concurrent packets might still be executing nf_log_packet() under rcu_read_lock()."
Clear the pointer via .pre_exit to make sure rcu readers have completed before pernet storage is free'd. The change in nf_log_syslog.c is only done for consistency: it doesn't use pernet data.
--- net/netfilter/nf_log_syslog.c | 4 ++-- net/netfilter/nfnetlink_log.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-)
net/netfilter/nf_log_syslog.c +2 -2
@@ -1014,7 +1014,7 @@ static int __net_init nf_log_syslog_net_init(struct net *net)return ret; } -static void __net_exit nf_log_syslog_net_exit(struct net *net) +static void __net_exit nf_log_syslog_net_pre_exit(struct net *net) {nf_log_unset (net, &nf_ip_logger);nf_log_unset (net, &nf_arp_logger);
@@ -1025,7 +1025,7 @@ static void __net_exit nf_log_syslog_net_exit(struct net *net)static struct pernet_operations nf_log_syslog_net_ops = { .init = nf_log_syslog_net_init, - .exit = nf_log_syslog_net_exit, + .pre_exit = nf_log_syslog_net_pre_exit, };static int __init nf_log_syslog_init (void )
net/netfilter/nfnetlink_log.c +9 -4
@@ -1170,21 +1170,26 @@ static int __net_init nfnl_log_net_init(struct net *net)return 0 ; } -static void __net_exit nfnl_log_net_exit(struct net *net) +static void __net_exit nfnl_log_net_pre_exit(struct net *net) { -struct nfnl_log_net *log =nfnl_log_pernet (net); -unsigned int i; -#ifdef CONFIG_PROC_FS remove_proc_entry ("nfnetlink_log" , net->nf.proc_netfilter);#endif nf_log_unset (net, &nfulnl_logger); +} + +static void __net_exit nfnl_log_net_exit(struct net *net) +{ +struct nfnl_log_net *log =nfnl_log_pernet (net); +unsigned int i; +for (i =0 ; i <INSTANCE_BUCKETS ; i++)WARN_ON_ONCE (!hlist_empty (&log->instance_table[i])); }static struct pernet_operations nfnl_log_net_ops = { .init = nfnl_log_net_init, + .pre_exit = nfnl_log_net_pre_exit, .exit = nfnl_log_net_exit, .id = &nfnl_log_net_id, .size =sizeof (struct nfnl_log_net ),
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 8/13 ipvs: clear IPv4 options after rebasing tunnel ICMP errors
In reply to Pablo Neira AyusoFrom: Kyle Zeng <[email protected]>
ip_vs_in_icmp() rebases an skb from the outer ICMP packet to the quoted original request before passing it to icmp_send(). However, IPCB(skb)->opt still describes the outer IPv4 header.
A timestamp option in the outer header can therefore leave an offset that points into the quoted transport header after the rebase. __ip_options_echo() treats a byte at that stale location as the option length and copies it into the fixed-size option storage on the __icmp_send() stack, causing a stack out-of-bounds write.
Clear the stale option metadata after resetting the network header. Keep the remaining control block fields, including the ingress interface used by the ICMP response path.
--- net/netfilter/ipvs/ip_vs_core.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/ipvs/ip_vs_core.c +1 -0
@@ -1950,6 +1950,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (pskb_pull (skb, offset2) ==NULL ) goto ignore_tunnel;skb_reset_network_header (skb); +memset (&(IPCB (skb)->opt),0 ,sizeof (IPCB (skb)->opt));/* Ensure the IP header is present in headroom */ if (!pskb_may_pull (skb, hlen_orig)) goto ignore_tunnel;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 9/13 ipvs: revalidate ihl to prevent out-of-bounds access
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
While the outer IP header is already pulled into the skb head, we must be careful and revalidate the embedded headers after reading them from the skb frags to prevent out-of-bounds access.
One such place reported by Sashiko is ip_vs_nat_icmp() where local process can change the ihl field and after skb_ensure_writable() we can see larger value which is a problem for the ip_send_check(cih) calls.
Add check to drop the packet if the ihl field is changed.
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 11 +++++++++-- net/netfilter/ipvs/ip_vs_xmit.c | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-)
include/net/ip_vs.h +1 -1
@@ -2068,7 +2068,7 @@ static inline bool ip_vs_conn_use_hash2(struct ip_vs_conn *cp) !(cp->flags &IP_VS_CONN_F_TEMPLATE ); } -void ip_vs_nat_icmp (struct sk_buff *skb,struct ip_vs_protocol *pp, +bool ip_vs_nat_icmp (struct sk_buff *skb,struct ip_vs_protocol *pp,struct ip_vs_conn *cp,int dir,unsigned int toff,bool has_ports,struct ip_vs_iphdr *ciph);
net/netfilter/ipvs/ip_vs_core.c +9 -2
@@ -923,7 +923,7 @@ static int ip_vs_route_me_harder(struct netns_ipvs *ipvs, int af,* Packet has been made sufficiently writable in caller * - inout: 1=in->out, 0=out->in */ -void ip_vs_nat_icmp (struct sk_buff *skb,struct ip_vs_protocol *pp, +bool ip_vs_nat_icmp (struct sk_buff *skb,struct ip_vs_protocol *pp,struct ip_vs_conn *cp,int inout,unsigned int toff,bool has_ports,struct ip_vs_iphdr *ciph) {
@@ -931,6 +931,11 @@ void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,struct icmphdr *icmph = (struct icmphdr *)(skb->data + toff);struct iphdr *cih = (struct iphdr *)(icmph +1 ); +/* Before now we may used ihl from skb frag, revalidate it after +* copying it into skb head to prevent out-of-bounds access +*/ +if (cih->ihl *4 != ciph->len - ciph->off) +return false;if (inout) { iph->saddr = cp->vaddr.ip;ip_send_check (iph);
@@ -964,6 +969,7 @@ void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,else IP_VS_DBG_PKT (11 ,AF_INET , pp, skb, ciph->off,"Forwarding altered incoming ICMP" ); +return true; }#ifdef CONFIG_IP_VS_IPV6
@@ -1055,7 +1061,8 @@ static int handle_response_icmp(int af, struct sk_buff *skb,ip_vs_nat_icmp_v6 (skb, pp, cp,1 , toff, has_ports, ciph); else#endif -ip_vs_nat_icmp (skb, pp, cp,1 , toff, has_ports, ciph); +if (!ip_vs_nat_icmp (skb, pp, cp,1 , toff, has_ports, ciph)) + goto out;if (ip_vs_route_me_harder (cp->ipvs, af, skb, hooknum)) goto out;
net/netfilter/ipvs/ip_vs_xmit.c +2 -1
@@ -1580,7 +1580,8 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,if (skb_cow (skb, rt->dst.dev->hard_header_len)) goto tx_error; -ip_vs_nat_icmp (skb, pp, cp,0 , toff, has_ports, ciph); +if (!ip_vs_nat_icmp (skb, pp, cp,0 , toff, has_ports, ciph)) + goto tx_error;/* Another hack: avoid icmp_send in ip_fragment */ skb->ignore_df =1 ;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 10/13 netfilter: nf_tables_offload: suppress WARN_ON_ONCE for ENOMEM in abort path
In reply to Pablo Neira AyusoFrom: Alexey Velichayshiy <[email protected]>
In nft_flow_rule_offload_abort(), WARN_ON_ONCE(err) is triggered on every error during rollback, including -ENOMEM. Memory allocation failures are expected under low-memory conditions and do not indicate a kernel bug.
Trace for example:nft_flow_offload_chain() // FLOW_BLOCK_BIND
nft_flow_block_chain()
nft_chain_offload_cmd()
nft_block_offload_cmd()
->ndo_setup_tc()
nsim_setup_tc()
flow_block_cb_setup_simple()
flow_block_cb_alloc() // fails to -ENOMEMThe warning was reproduced on the 5.10 stable kernel under memory pressure via fault injection, but the underlying bug exists in mainline as well, as demonstrated by the ENOMEM trace above. The following splat was triggered during nf_tables transaction processing:
WARNING: CPU: 0 PID: 8567 at net/netfilter/nf_tables_offload.c:532 nft_flow_rule_offload_abort net/netfilter/nf_tables_offload.c:532 [inline] WARNING: CPU: 0 PID: 8567 at net/netfilter/nf_tables_offload.c:532 nft_flow_rule_offload_commit+0x971/0xcd0 net/netfilter/nf_tables_offload.c:591 Modules linked in: CPU: 0 PID: 8567 Comm: syz-executor.0 Not tainted 5.10.260-syzkaller #0 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 RIP: 0010:nft_flow_rule_offload_abort net/netfilter/nf_tables_offload.c:532 [inline] RIP: 0010:nft_flow_rule_offload_commit+0x971/0xcd0 net/netfilter/nf_tables_offload.c:591 Call Trace: nf_tables_commit+0x3bd/0x4bd0 net/netfilter/nf_tables_api.c:8604 nfnetlink_rcv_batch+0xb1e/0x1f20 net/netfilter/nfnetlink.c:509 nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:579 [inline] nfnetlink_rcv+0x3b3/0x420 net/netfilter/nfnetlink.c:597 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x6cd/0xa00 net/netfilter/af_netlink.c:1340 netlink_sendmsg+0x906/0xe10 net/netfilter/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] __sock_sendmsg+0x155/0x190 net/socket.c:663 ____sys_sendmsg+0x705/0x870 net/socket.c:2379 ___sys_sendmsg+0x100/0x170 net/socket.c:2433 __sys_sendmsg+0xe9/0x1c0 net/socket.c:2462 do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x67/0xd1
Change the condition to WARN_ON_ONCE(err && err != -ENOMEM) so that warnings are only emitted for unexpected errors. This aligns with the common kernel practice of not warning on -ENOMEM.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- net/netfilter/nf_tables_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_offload.c +1 -1
@@ -558,7 +558,7 @@ static void nft_flow_rule_offload_abort(struct net *net,break ; } -if (WARN_ON_ONCE (err)) +if (WARN_ON_ONCE (err && err != -ENOMEM ))break ; } }
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 11/13 netfilter: flowtable: publish GC-visible tuple last
In reply to Pablo Neira AyusoFrom: Jérémy Jean <[email protected]>
nf_flow_table_iterate() only treats original-direction tuple nodes as owning entries. Publishing the original node first lets GC observe and free a flow while flow_offload_add() is still inserting the reply node. Publish the reply node first and the original node last so GC never sees a partially installed flow.
KASAN can trigger slab-use-after-free read and write reports in the flowtable/rhashtable path (rht_deferred_worker, jhash, flow_offload_del, flow_offload_lookup, etc.).
--- net/netfilter/nf_flow_table_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/netfilter/nf_flow_table_core.c +4 -3
@@ -332,17 +332,18 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow) flow->timeout = nf_flowtable_time_stamp +flow_offload_get_timeout (flow); err =rhashtable_insert_fast (&flow_table->rhashtable, - &flow->tuplehash[0 ].node, + &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params);if (err <0 )return err; +/* GC only iterates original-direction entries; publish original last. */ err =rhashtable_insert_fast (&flow_table->rhashtable, - &flow->tuplehash[1 ].node, + &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);if (err <0 ) {rhashtable_remove_fast (&flow_table->rhashtable, - &flow->tuplehash[0 ].node, + &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params);return err; }
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 12/13 netfilter: ipset: fix list type element drift bug
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
If list_set_uadd() calls list_set_replace() to swap an expired entry, the element count remains the same, therefore the increment must be elided.
--- net/netfilter/ipset/ip_set_list_set.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/ipset/ip_set_list_set.c +5 -2
@@ -301,9 +301,12 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext, e->set = set;INIT_LIST_HEAD (&e->list);list_set_init_extensions (set, ext, e); -if (n) +if (n) {list_set_replace (set, e, n); -else if (next) +return 0 ; + } + +if (next)list_add_tail_rcu (&e->list, &next->list);else if (prev)list_add_rcu (&e->list, &prev->list);
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 13/13 netfilter: ipset: let destroy callbacks adjust ext mem size
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
For bitmap this change makes no difference, because destructors are called synchronously.
List type however calls them via call_rcu() so accounting decrement can happen after list_set_flush() set ext_size to 0.
'set->elements = 0' can be removed for the same reason in the list type case, it calls 'set->elements--' for each element.
--- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- net/netfilter/ipset/ip_set_list_set.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
@@ -77,7 +77,7 @@ mtype_flush(struct ip_set *set)mtype_ext_cleanup (set);bitmap_zero (map->members, map->elements); set->elements =0 ; -atomic64_set (&set->ext_size,0 ); +DEBUG_NET_WARN_ON_ONCE (atomic64_read (&set->ext_size) >0 ); }/* Calculate the actual memory size of the set data */
net/netfilter/ipset/ip_set_list_set.c +1 -2
@@ -423,8 +423,7 @@ list_set_flush(struct ip_set *set)list_for_each_entry_safe (e, n, &map->members, list)list_set_del (set, e); - set->elements =0 ; -atomic64_set (&set->ext_size,0 ); +DEBUG_NET_WARN_ON_ONCE (set->elements >0 ); } static void
Signature · 1 line
2.47.3
Jakub Kicinski
maintainerQuoted 3 lines · On Mon, 10 Aug 2026 21:06:08 +0200 Pablo Neira Ayuso wrote:
The following patchset contains Netfilter/IPVS fixes for net. Still large batch for this late -rc cycle but at least have of these fixes in this batch have been cooking for several weeks before:
Does any of the AI-detected issues seem concerning?
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]
Florian Westphal
maintainerQuoted 8 lines · Jakub Kicinski
Quoted 3 lines · On Mon, 10 Aug 2026 21:06:08 +0200 Pablo Neira Ayuso wrote:
The following patchset contains Netfilter/IPVS fixes for net. Still large batch for this late -rc cycle but at least have of these fixes in this batch have been cooking for several weeks before:
Does any of the AI-detected issues seem concerning?
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]
Only commenting on those patches that I worked on or commented during review:
Patch 6: [PATCH net 06/13] netfilter: nf_conntrack: defer invalid log until after unlock
Its fine. This is for debugging. We could restore the removed info if anyone needs it, I even was about to suggest to original author to simply remove the invalid logging but decided against it (since you can log the packet to userspace via nfnetlink). I prefer the simpler version that doesn't snapshot data while under lock.
Patch 7: [PATCH net 07/13] netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state
Yes, one could have added this Fixes tag or Cc stable to the patch. Don't think this warrants a respin by itself.
Patch 12: [PATCH net 12/13] netfilter: ipset: fix list type element drift bug
Even if the ordering is "wrong", the patch that
added it is ancient (even in RHEL7) so its long established behaviour.
ipset test suite also has test for this and those tests pass, so changing kernel behaviour will need to adjust (old..) test cases as well.
Pablo Neira Ayuso
maintainerQuoted 26 lines · Florian Westphal
Quoted 8 lines · Jakub Kicinski
Quoted 3 lines · On Mon, 10 Aug 2026 21:06:08 +0200 Pablo Neira Ayuso wrote:
The following patchset contains Netfilter/IPVS fixes for net. Still large batch for this late -rc cycle but at least have of these fixes in this batch have been cooking for several weeks before:
Does any of the AI-detected issues seem concerning?
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]
Only commenting on those patches that I worked on or commented during review:
Patch 6: [PATCH net 06/13] netfilter:
nf_conntrack: defer invalid log until after unlockIts fine. This is for debugging. We could restore the removed info if anyone needs it, I even was about to suggest to original author to simply remove the invalid logging but decided against it (since you can log the packet to userspace via nfnetlink). I prefer the simpler version that doesn't snapshot data while under lock.
Patch 7: [PATCH net 07/13] netfilter:
nfnetlink_log: wait for rcu grace period before freeing pernet stateYes, one could have added this Fixes tag or Cc stable to the patch. Don't think this warrants a respin by itself.
Quoted 8 lines
Patch 12: [PATCH net 12/13] netfilter: ipset: fix list type element drift bug
Even if the ordering is "wrong", the patch that
added it is ancient (even in RHEL7) so its long established behaviour.ipset test suite also has test for this and those tests pass, so changing kernel behaviour will need to adjust (old..) test cases as well.
Patch 10: [PATCH net 10/13] netfilter: nf_tables_offload: suppress WARN_ON_ONCE for ENOMEM in abort path
This is known issue and I've been working on a patch to address what sashiko reports, basically, in case hardware offload is enabled, errors should also rollback to the previous state.
There seem to be a path with hardware offload indirect flow block that is buggy because ENOMEM is propagated as EOPNOTSUPP.
I need to follow up.
Patch 11: [PATCH net 11/13] netfilter: flowtable: publish GC-visible tuple last
Sashiko indicates that this needs a follow up because hardware offload can still trigger a race with GC.
This also needs a follow up.