* [PATCH net v3 1/2] dim: clear irq_moder on init failure
2026-11-22 9:05 [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind Jianlin Shi
@ 2026-11-22 9:05 ` Jianlin Shi
2026-11-22 9:05 ` [PATCH net v3 2/2] virtio-net: unwind VQs when irq moderation init fails Jianlin Shi
2026-11-22 9:13 ` [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind netdev-bot+sinfo
2 siblings, 0 replies; 4+ messages in thread
From: Jianlin Shi @ 2026-11-22 9:05 UTC (permalink / raw)
To: netdev
Cc: mst, jasowang, eperezma, xuanzhuo, andrew+netdev, davem, edumazet,
kuba, pabeni, talgi, hengqi, horms, virtualization
net_dim_init_irq_moder() publishes the allocated struct via
dev->irq_moder before copying the moderation profiles. If a
kmemdup() fails, the error path frees the object but leaves
dev->irq_moder dangling. net_dim_free_irq_moder() treats a
non-NULL irq_moder as live: it dereferences
dev->irq_moder->rx_profile / tx_profile under RTNL and frees the
object a second time.
On current mainline the only in-tree caller of
net_dim_init_irq_moder() is virtnet_probe(), and its failure path
today does "goto free", which only reaches free_netdev(); nothing
calls net_dim_free_irq_moder() there, so the dangling pointer is
never dereferenced. The bug becomes reachable once the caller
unwinds through the existing free_irq_moder label, as virtio-net
starts doing in the follow-up fix:
virtnet_probe()
virtnet_init_irq_moder()
net_dim_init_irq_moder() /* kmemdup fails:
kfree(moder),
dev->irq_moder stale */
goto free_irq_moder
virtnet_free_irq_moder()
net_dim_free_irq_moder() /* non-NULL irq_moder =>
rtnl_dereference(
dev->irq_moder->rx_profile)
use-after-free,
kfree() a second time */
This patch is the prerequisite that makes such an unwind safe;
without it the follow-up would trade the virtqueue leak for a
use-after-free and a double kfree on this error path.
NULL the pointer after freeing it, so a later
net_dim_free_irq_moder() is a no-op and the device is left as if
initialization never happened.
Fixes: f750dfe825b90 ("ethtool: provide customized dim profile management")
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jianlin Shi <shijianlin11@foxmail.com>
---
lib/dim/net_dim.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/dim/net_dim.c b/lib/dim/net_dim.c
index d8d4f6553559..bf59deae6a29 100644
--- a/lib/dim/net_dim.c
+++ b/lib/dim/net_dim.c
@@ -141,6 +141,7 @@ int net_dim_init_irq_moder(struct net_device *dev, u8 profile_flags,
kfree(rxp);
free_moder:
kfree(moder);
+ dev->irq_moder = NULL;
return -ENOMEM;
}
EXPORT_SYMBOL(net_dim_init_irq_moder);
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH net v3 2/2] virtio-net: unwind VQs when irq moderation init fails
2026-11-22 9:05 [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind Jianlin Shi
2026-11-22 9:05 ` [PATCH net v3 1/2] dim: clear irq_moder on init failure Jianlin Shi
@ 2026-11-22 9:05 ` Jianlin Shi
2026-11-22 9:13 ` [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind netdev-bot+sinfo
2 siblings, 0 replies; 4+ messages in thread
From: Jianlin Shi @ 2026-11-22 9:05 UTC (permalink / raw)
To: netdev
Cc: mst, jasowang, eperezma, xuanzhuo, andrew+netdev, davem, edumazet,
kuba, pabeni, talgi, hengqi, horms, virtualization
virtnet_probe() calls init_vqs() before virtnet_init_irq_moder().
When the irq moderation init fails, the error path does "goto
free", which only reaches free_netdev(): virtio_reset_device() and
virtnet_del_vqs() are skipped, leaking the virtqueues and their
DMA mappings.
Use the existing free_irq_moder label instead, as
virtnet_create_page_pools() already does on failure. This is safe
only after net_dim_init_irq_moder() clears dev->irq_moder on its
own failure (previous patch); otherwise virtnet_free_irq_moder()
would net_dim_free_irq_moder() a dangling pointer, dereferencing
freed memory and freeing it a second time.
Fixes: dcb67f6a9ead6 ("virtio-net: support dim profile fine-tuning")
Signed-off-by: Jianlin Shi <shijianlin11@foxmail.com>
---
drivers/net/virtio_net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 1cd64f9e12e7..c307d39e01d1 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -7051,7 +7051,7 @@ static int virtnet_probe(struct virtio_device *vdev)
err = virtnet_init_irq_moder(vi);
if (err)
- goto free;
+ goto free_irq_moder;
}
/* Create page pools for receive queues.
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind
2026-11-22 9:05 [PATCH net v3 0/2] virtio-net/dim: fix irq moderation init failure unwind Jianlin Shi
2026-11-22 9:05 ` [PATCH net v3 1/2] dim: clear irq_moder on init failure Jianlin Shi
2026-11-22 9:05 ` [PATCH net v3 2/2] virtio-net: unwind VQs when irq moderation init fails Jianlin Shi
@ 2026-11-22 9:13 ` netdev-bot+sinfo
2 siblings, 0 replies; 4+ messages in thread
From: netdev-bot+sinfo @ 2026-11-22 9:13 UTC (permalink / raw)
To: Jianlin Shi
Cc: netdev, mst, jasowang, eperezma, xuanzhuo, andrew+netdev, davem,
edumazet, kuba, pabeni, talgi, hengqi, horms, virtualization
Hi!
This is an automated message. This series looks like a fix, but its
commit messages seem to be missing some information:
- How the issue was discovered, e.g. hit in production, hit during
development, syzbot report, manual code inspection, LLM or static
analysis tool scan.
- Whether the issue was actually triggered, or is only theoretical
(e.g. found by LLM and not proven at runtime). If it was triggered
please include the symptoms, like the stack trace or kernel messages.
Please do not repost the series just to address the above. Instead,
reply to this email with the missing information, so that reviewers
can take it into account.
*IMPORTANT*: If you do repost (for other reasons) - please include
the relevant info in the cover letter or commit messages.
--
The evaluation is done by an LLM so it may be wrong, if you think
that is the case please reply and explain.
^ permalink raw reply [flat|nested] 4+ messages in thread