netfilter updates for net
Subsystems (5)
Florian Westphal
maintainercover netfilter updates for net
Hi.
This pull requests contain netfilter fixes for the *net* tree. I only included crash fixes, as we're closer to a release, rest will be handled via -next.
1) Fix a NULL pointer dereference in ip_vs_add_service error path, from Weiming Shi, bug added in 6.2 development cycle.
2) Don't leak kernel data bytes from allocator to userspace: nfnetlink_log needs to init the trailing NLMSG_DONE terminator. From Xiang Mei.
3) xt_multiport match lacks range validation, bogus userspace request will cause out-of-bounds read. From Ren Wei.
4) ip6t_eui64 match must reject packets with invalid mac header before calling eth_hdr. Make existing check unconditional. From Zhengchuan Liang.
5) nft_ct timeout policies are free'd via kfree() while they may still be reachable by other cpus that process a conntrack object that uses such a timeout policy. Existing reaping of entries is not sufficient because it doesn't wait for a grace period. Use kfree_rcu(). From Tuan Do.
6/7) Make nfnetlink_queue hash table per queue. As-is we can hit a page
fault in case underlying page of removed element was free'd. Per-queue hash prevents parallel lookups. This comes with a test case that demonstrates the bug, from Fernando Fernandez Mancera.
Please, pull these changes from:
The following changes since commit f821664dde29302e8450aa0597bf1e4c7c5b0a22:
Merge branch 'seg6-fix-dst_cache-sharing-in-seg6-lwtunnel' (2026-04-07 20:21:00 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-26-04-08
for you to fetch changes up to dde1a6084c5ca9d143a562540d5453454d79ea15:
selftests: nft_queue.sh: add a parallel stress test (2026-04-08 13:34:51 +0200)
----------------------------------------------------------------
netfilter pull request nf-26-04-08
----------------------------------------------------------------
Fernando Fernandez Mancera (1):
selftests: nft_queue.sh: add a parallel stress test
Florian Westphal (1):
netfilter: nfnetlink_queue: make hash table per queue
Ren Wei (1):
netfilter: xt_multiport: validate range encoding in checkentry
Tuan Do (1):
netfilter: nft_ct: fix use-after-free in timeout object destroy
Weiming Shi (1):
ipvs: fix NULL deref in ip_vs_add_service error path
Xiang Mei (1):
netfilter: nfnetlink_log: initialize nfgenmsg in NLMSG_DONE terminator
Zhengchuan Liang (1):
netfilter: ip6t_eui64: reject invalid MAC header for all packets
include/net/netfilter/nf_conntrack_timeout.h | 1 + include/net/netfilter/nf_queue.h | 1 - net/ipv6/netfilter/ip6t_eui64.c | 3 +- net/netfilter/ipvs/ip_vs_ctl.c | 1 - net/netfilter/nfnetlink_log.c | 8 +- net/netfilter/nfnetlink_queue.c | 139 ++++++------------ net/netfilter/nft_ct.c | 2 +- net/netfilter/xt_multiport.c | 34 ++++- .../selftests/net/netfilter/nf_queue.c | 50 ++++++- .../selftests/net/netfilter/nft_queue.sh | 83 +++++++++-- 10 files changed, 201 insertions(+), 121 deletions(-)
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 1/7 ipvs: fix NULL deref in ip_vs_add_service error path
From: Weiming Shi <[email protected]>
When ip_vs_bind_scheduler() succeeds in ip_vs_add_service(), the local variable sched is set to NULL. If ip_vs_start_estimator() subsequently fails, the out_err cleanup calls ip_vs_unbind_scheduler(svc, sched) with sched == NULL. ip_vs_unbind_scheduler() passes the cur_sched NULL check (because svc->scheduler was set by the successful bind) but then dereferences the NULL sched parameter at sched->done_service, causing a kernel panic at offset 0x30 from NULL.
Oops: general protection fault, [..] [#1] PREEMPT SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000030-0x0000000000000037] RIP: 0010:ip_vs_unbind_scheduler (net/netfilter/ipvs/ip_vs_sched.c:69) Call Trace: <TASK> ip_vs_add_service.isra.0 (net/netfilter/ipvs/ip_vs_ctl.c:1500) do_ip_vs_set_ctl (net/netfilter/ipvs/ip_vs_ctl.c:2809) nf_setsockopt (net/netfilter/nf_sockopt.c:102) [..]
Fix by simply not clearing the local sched variable after a successful bind. ip_vs_unbind_scheduler() already detects whether a scheduler is installed via svc->scheduler, and keeping sched non-NULL ensures the error path passes the correct pointer to both ip_vs_unbind_scheduler() and ip_vs_scheduler_put().
While the bug is older, the problem popups in more recent kernels (6.2), when the new error path is taken after the ip_vs_start_estimator() call.
--- net/netfilter/ipvs/ip_vs_ctl.c | 1 - 1 file changed, 1 deletion(-)
net/netfilter/ipvs/ip_vs_ctl.c +0 -1
@@ -1452,7 +1452,6 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u, ret =ip_vs_bind_scheduler (svc, sched);if (ret) goto out_err; - sched =NULL ; } ret =ip_vs_start_estimator (ipvs, &svc->stats);
Signature · 1 line
2.52.0
Re: [PATCH net 1/7] ipvs: fix NULL deref in ip_vs_add_service error path
This series was applied to netdev/net.git (main) by Florian Westphal <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Florian Westphal <[email protected]>:
Quoted 11 lines · On Wed, 8 Apr 2026 18:35:06 +0200 you wrote:
From: Weiming Shi <[email protected]>
When
ip_vs_bind_scheduler()succeeds inip_vs_add_service(), the local variable sched is set to NULL. Ifip_vs_start_estimator()subsequently fails, theout_errcleanup callsip_vs_unbind_scheduler(svc, sched)with sched == NULL.ip_vs_unbind_scheduler()passes thecur_schedNULL check (becausesvc->schedulerwas set by the successful bind) but then dereferences the NULL sched parameter atsched->done_service, causing a kernel panic at offset0x30from NULL.[...]
Here is the summary with links:
- [net,1/7] ipvs: fix NULL deref in ip_vs_add_service error path
https://git.kernel.org/netdev/net/c/9a91797e61d2 - [net,2/7] netfilter: nfnetlink_log: initialize nfgenmsg in NLMSG_DONE terminator https://git.kernel.org/netdev/net/c/1f3083aec883 - [net,3/7] netfilter: xt_multiport: validate range encoding in checkentry https://git.kernel.org/netdev/net/c/ff64c5bfef12 - [net,4/7] netfilter: ip6t_eui64: reject invalid MAC header for all packets https://git.kernel.org/netdev/net/c/fdce0b3590f7 - [net,5/7] netfilter: nft_ct: fix use-after-free in timeout object destroy https://git.kernel.org/netdev/net/c/f8dca15a1b19 - [net,6/7] netfilter: nfnetlink_queue: make hash table per queue https://git.kernel.org/netdev/net/c/936206e3f6ff - [net,7/7] selftests: nft_queue.sh: add a parallel stress test https://git.kernel.org/netdev/net/c/dde1a6084c5c
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/7 netfilter: nfnetlink_log: initialize nfgenmsg in NLMSG_DONE terminator
In reply to Florian WestphalFrom: Xiang Mei <[email protected]>
When batching multiple NFLOG messages (inst->qlen > 1), __nfulnl_send() appends an NLMSG_DONE terminator with sizeof(struct nfgenmsg) payload via nlmsg_put(), but never initializes the nfgenmsg bytes. The nlmsg_put() helper only zeroes alignment padding after the payload, not the payload itself, so four bytes of stale kernel heap data are leaked to userspace in the NLMSG_DONE message body.
Use nfnl_msg_put() to build the NLMSG_DONE terminator, which initializes the nfgenmsg payload via nfnl_fill_hdr(), consistent with how __build_packet_message() already constructs NFULNL_MSG_PACKET headers.
--- net/netfilter/nfnetlink_log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nfnetlink_log.c +4 -4
@@ -361,10 +361,10 @@ static void __nfulnl_send(struct nfulnl_instance *inst) {if (inst->qlen >1 ) { -struct nlmsghdr *nlh =nlmsg_put (inst->skb,0 ,0 , -NLMSG_DONE , -sizeof (struct nfgenmsg ), -0 ); +struct nlmsghdr *nlh =nfnl_msg_put (inst->skb,0 ,0 , +NLMSG_DONE ,0 , +AF_UNSPEC ,NFNETLINK_V0 , +htons (inst->group_num));if (WARN_ONCE (!nlh,"bad nlskb size: %u, tailroom %d\n" , inst->skb->len,skb_tailroom (inst->skb))) {kfree_skb (inst->skb);
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 3/7 netfilter: xt_multiport: validate range encoding in checkentry
In reply to Florian WestphalFrom: Ren Wei <[email protected]>
ports_match_v1() treats any non-zero pflags entry as the start of a port range and unconditionally consumes the next ports[] element as the range end.
The checkentry path currently validates protocol, flags and count, but it does not validate the range encoding itself. As a result, malformed rules can mark the last slot as a range start or place two range starts back to back, leaving ports_match_v1() to step past the last valid ports[] element while interpreting the rule.
Reject malformed multiport v1 rules in checkentry by validating that each range start has a following element and that the following element is not itself marked as another range start.
--- net/netfilter/xt_multiport.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
net/netfilter/xt_multiport.c +30 -4
@@ -105,6 +105,28 @@ multiport_mt(const struct sk_buff *skb, struct xt_action_param *par)return ports_match_v1 (multiinfo,ntohs (pptr[0 ]),ntohs (pptr[1 ])); } +static bool +multiport_valid_ranges (const struct xt_multiport_v1 *multiinfo) +{ +unsigned int i; + +for (i =0 ; i < multiinfo->count; i++) { +if (!multiinfo->pflags[i]) +continue ; + +if (++i >= multiinfo->count) +return false; + +if (multiinfo->pflags[i]) +return false; + +if (multiinfo->ports[i -1 ] > multiinfo->ports[i]) +return false; + } + +return true; +} + static inline bool check(u_int16_t proto, u_int8_t ip_invflags,
@@ -127,8 +149,10 @@ static int multiport_mt_check(const struct xt_mtchk_param *par)const struct ipt_ip *ip = par->entryinfo;const struct xt_multiport_v1 *multiinfo = par->matchinfo; -return check (ip->proto, ip->invflags, multiinfo->flags, - multiinfo->count) ?0 : -EINVAL ; +if (!check (ip->proto, ip->invflags, multiinfo->flags, multiinfo->count)) +return -EINVAL ; + +return multiport_valid_ranges (multiinfo) ?0 : -EINVAL ; }static int multiport_mt6_check (const struct xt_mtchk_param *par)
@@ -136,8 +160,10 @@ static int multiport_mt6_check(const struct xt_mtchk_param *par)const struct ip6t_ip6 *ip = par->entryinfo;const struct xt_multiport_v1 *multiinfo = par->matchinfo; -return check (ip->proto, ip->invflags, multiinfo->flags, - multiinfo->count) ?0 : -EINVAL ; +if (!check (ip->proto, ip->invflags, multiinfo->flags, multiinfo->count)) +return -EINVAL ; + +return multiport_valid_ranges (multiinfo) ?0 : -EINVAL ; }static struct xt_match multiport_mt_reg[]__read_mostly = {
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 4/7 netfilter: ip6t_eui64: reject invalid MAC header for all packets
In reply to Florian WestphalFrom: Zhengchuan Liang <[email protected]>
eui64_mt6() derives a modified EUI-64 from the Ethernet source address and compares it with the low 64 bits of the IPv6 source address.
The existing guard only rejects an invalid MAC header when par->fragoff != 0. For packets with par->fragoff == 0, eui64_mt6() can still reach eth_hdr(skb) even when the MAC header is not valid.
Fix this by removing the par->fragoff != 0 condition so that packets with an invalid MAC header are rejected before accessing eth_hdr(skb).
--- net/ipv6/netfilter/ip6t_eui64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv6/netfilter/ip6t_eui64.c +1 -2
@@ -22,8 +22,7 @@ eui64_mt6(const struct sk_buff *skb, struct xt_action_param *par)unsigned char eui64[8 ];if (!(skb_mac_header (skb) >= skb->head && -skb_mac_header (skb) +ETH_HLEN <= skb->data) && - par->fragoff !=0 ) { +skb_mac_header (skb) +ETH_HLEN <= skb->data)) { par->hotdrop = true;return false; }
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 5/7 netfilter: nft_ct: fix use-after-free in timeout object destroy
In reply to Florian WestphalFrom: Tuan Do <[email protected]>
nft_ct_timeout_obj_destroy() frees the timeout object with kfree() immediately after nf_ct_untimeout(), without waiting for an RCU grace period. Concurrent packet processing on other CPUs may still hold RCU-protected references to the timeout object obtained via rcu_dereference() in nf_ct_timeout_data().
Add an rcu_head to struct nf_ct_timeout and use kfree_rcu() to defer freeing until after an RCU grace period, matching the approach already used in nfnetlink_cttimeout.c.
KASAN report:
BUG: KASAN: slab-use-after-free in nf_conntrack_tcp_packet+0x1381/0x29d0 Read of size 4 at addr ffff8881035fe19c by task exploit/80 Call Trace: nf_conntrack_tcp_packet+0x1381/0x29d0 nf_conntrack_in+0x612/0x8b0 nf_hook_slow+0x70/0x100 __ip_local_out+0x1b2/0x210 tcp_sendmsg_locked+0x722/0x1580 __sys_sendto+0x2d8/0x320 Allocated by task 75: nft_ct_timeout_obj_init+0xf6/0x290 nft_obj_init+0x107/0x1b0 nf_tables_newobj+0x680/0x9c0 nfnetlink_rcv_batch+0xc29/0xe00 Freed by task 26: nft_obj_destroy+0x3f/0xa0 nf_tables_trans_destroy_work+0x51c/0x5c0 process_one_work+0x2c4/0x5a0
--- include/net/netfilter/nf_conntrack_timeout.h | 1 + net/netfilter/nft_ct.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
include/net/netfilter/nf_conntrack_timeout.h +1 -0
@@ -14,6 +14,7 @@struct nf_ct_timeout {__u16 l3num;const struct nf_conntrack_l4proto *l4proto; +struct rcu_head rcu;char data[]; };
net/netfilter/nft_ct.c +1 -1
@@ -1020,7 +1020,7 @@ static void nft_ct_timeout_obj_destroy(const struct nft_ctx *ctx,nf_queue_nf_hook_drop (ctx->net);nf_ct_untimeout (ctx->net, timeout);nf_ct_netns_put (ctx->net, ctx->family); -kfree (priv->timeout); +kfree_rcu (priv->timeout, rcu); } static int nft_ct_timeout_obj_dump(struct sk_buff *skb,
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 6/7 netfilter: nfnetlink_queue: make hash table per queue
In reply to Florian WestphalSharing a global hash table among all queues is tempting, but it can cause crash:
BUG: KASAN: slab-use-after-free in nfqnl_recv_verdict+0x11ac/0x15e0 [nfnetlink_queue] [..] nfqnl_recv_verdict+0x11ac/0x15e0 [nfnetlink_queue] nfnetlink_rcv_msg+0x46a/0x930 kmem_cache_alloc_node_noprof+0x11e/0x450
struct nf_queue_entry is freed via kfree, but parallel cpu can still encounter such an nf_queue_entry when walking the list.
Alternative fix is to free the nf_queue_entry via kfree_rcu() instead, but as we have to alloc/free for each skb this will cause more mem pressure.
--- include/net/netfilter/nf_queue.h | 1 - net/netfilter/nfnetlink_queue.c | 139 +++++++++++-------------------- 2 files changed, 49 insertions(+), 91 deletions(-)
include/net/netfilter/nf_queue.h +0 -1
@@ -23,7 +23,6 @@ struct nf_queue_entry {struct nf_hook_state state;bool nf_ct_is_unconfirmed;u16 size;/* sizeof(entry) + saved route keys */ -u16 queue_num;/* extra space to store route keys */ };
net/netfilter/nfnetlink_queue.c +49 -90
248 lines not on this page · raw message
Signature · 1 line
2.52.0
Florian Westphal
maintainerPATCH 7/7 selftests: nft_queue.sh: add a parallel stress test
In reply to Florian WestphalFrom: Fernando Fernandez Mancera <[email protected]>
Introduce a new stress test to check for race conditions in the nfnetlink_queue subsystem, where an entry is freed while another CPU is concurrently walking the global rhashtable.
To trigger this, nf_queue.c is extended with two new flags:
* -O (out-of-order): Buffers packet IDs and flushes them in reverse.
* -b (bogus verdicts): Floods the kernel with non-existent packet IDs.
The bogus verdict loop forces the kernel's lookup function to perform full rhashtable bucket traversals (-ENOENT). Combined with reverse-order flushing and heavy parallel UDP/ping flooding across 8 queues, this puts the nfnetlink_queue code under pressure.
Joint work with Florian Westphal.
--- .../selftests/net/netfilter/nf_queue.c | 50 +++++++++-- .../selftests/net/netfilter/nft_queue.sh | 83 ++++++++++++++++--- 2 files changed, 115 insertions(+), 18 deletions(-)
tools/testing/selftests/net/netfilter/nf_queue.c +44 -6
@@ -19,6 +19,8 @@ struct options {bool count_packets;bool gso_enabled;bool failopen; +bool out_of_order; +bool bogus_verdict;int verbose;unsigned int queue_num;unsigned int timeout;
@@ -31,7 +33,7 @@ static struct options opts;static void help (const char *p) { -printf ("Usage: %s [-c|-v [-vv] ] [-o] [-t timeout] [-q queue_num] [-Qdst_queue ] [ -d ms_delay ] [-G]\n" , p); +printf ("Usage: %s [-c|-v [-vv] ] [-o] [-O] [-b] [-t timeout] [-q queue_num] [-Qdst_queue ] [ -d ms_delay ] [-G]\n" , p); }static int parse_attr_cb (const struct nlattr *attr,void *data)
@@ -275,7 +277,9 @@ static int mainloop(void)unsigned int buflen =64 *1024 +MNL_SOCKET_BUFFER_SIZE ;struct mnl_socket *nl;struct nlmsghdr *nlh; +uint32_t ooo_ids[16 ];unsigned int portid; +int ooo_count =0 ;char *buf;int ret;
@@ -308,6 +312,9 @@ static int mainloop(void) ret =mnl_cb_run (buf, ret,0 , portid, queue_cb,NULL );if (ret <0 ) { +/* bogus verdict mode will generate ENOENT error messages */ +if (opts.bogus_verdict && errno ==ENOENT ) +continue ;perror ("mnl_cb_run" );exit (EXIT_FAILURE ); }
@@ -316,10 +323,35 @@ static int mainloop(void)if (opts.delay_ms)sleep_ms (opts.delay_ms); - nlh =nfq_build_verdict (buf, id, opts.queue_num, opts.verdict); -if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) <0 ) { -perror ("mnl_socket_sendto" ); -exit (EXIT_FAILURE ); +if (opts.bogus_verdict) { +for (int i =0 ; i <50 ; i++) { + nlh =nfq_build_verdict (buf, id +0x7FFFFFFF + i, + opts.queue_num, opts.verdict); +mnl_socket_sendto (nl, nlh, nlh->nlmsg_len); + } + } + +if (opts.out_of_order) { + ooo_ids[ooo_count] = id; +if (ooo_count >=15 ) { +for (ooo_count; ooo_count >=0 ; ooo_count--) { + nlh =nfq_build_verdict (buf, ooo_ids[ooo_count], + opts.queue_num, opts.verdict); +if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) <0 ) { +perror ("mnl_socket_sendto" ); +exit (EXIT_FAILURE ); + } + } + ooo_count =0 ; + }else { + ooo_count++; + } + }else { + nlh =nfq_build_verdict (buf, id, opts.queue_num, opts.verdict); +if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) <0 ) { +perror ("mnl_socket_sendto" ); +exit (EXIT_FAILURE ); + } } }
@@ -332,7 +364,7 @@ static void parse_opts(int argc, char **argv) {int c; -while ((c =getopt (argc, argv,"chvot:q:Q:d:G" )) !=-1 ) { +while ((c =getopt (argc, argv,"chvoObt:q:Q:d:G" )) !=-1 ) {switch (c) {case 'c' : opts.count_packets = true;
@@ -375,6 +407,12 @@ static void parse_opts(int argc, char **argv)case 'v' : opts.verbose++;break ; +case 'O' : + opts.out_of_order = true; +break ; +case 'b' : + opts.bogus_verdict = true; +break ; } }
tools/testing/selftests/net/netfilter/nft_queue.sh +71 -12
107 lines not on this page · raw message
Signature · 1 line
2.52.0