[PATCH AUTOSEL 6.16] virtio_net: adjust the execution order of function `virtnet_close` during freeze
From: Sasha Levin <sashal@kernel.org>
Date: 2025-09-02 12:08:59
Also in:
linux-patches, stable, virtualization
Subsystem:
networking drivers, the rest, virtio net driver · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, "Michael S. Tsirkin", Jason Wang
From: Junnan Wu <redacted>
[ Upstream commit 45d8ef6322b8a828d3b1e2cfb8893e2ff882cb23 ]
"Use after free" issue appears in suspend once race occurs when
napi poll scheduls after `netif_device_detach` and before napi disables.
For details, during suspend flow of virtio-net,
the tx queue state is set to "__QUEUE_STATE_DRV_XOFF" by CPU-A.
And at some coincidental times, if a TCP connection is still working,
CPU-B does `virtnet_poll` before napi disable.
In this flow, the state "__QUEUE_STATE_DRV_XOFF"
of tx queue will be cleared. This is not the normal process it expects.
After that, CPU-A continues to close driver then virtqueue is removed.
Sequence likes below:
--------------------------------------------------------------------------
CPU-A CPU-B
----- -----
suspend is called A TCP based on
virtio-net still work
virtnet_freeze
|- virtnet_freeze_down
| |- netif_device_detach
| | |- netif_tx_stop_all_queues
| | |- netif_tx_stop_queue
| | |- set_bit
| | (__QUEUE_STATE_DRV_XOFF,...)
| | softirq rasied
| | |- net_rx_action
| | |- napi_poll
| | |- virtnet_poll
| | |- virtnet_poll_cleantx
| | |- netif_tx_wake_queue
| | |- test_and_clear_bit
| | (__QUEUE_STATE_DRV_XOFF,...)
| |- virtnet_close
| |- virtnet_disable_queue_pair
| |- virtnet_napi_tx_disable
|- remove_vq_common
--------------------------------------------------------------------------
When TCP delayack timer is up, a cpu gets softirq and irq handler
`tcp_delack_timer_handler` will be called, which will finally call
`start_xmit` in virtio net driver.
Then the access to tx virtq will cause panic.
The root cause of this issue is that napi tx
is not disable before `netif_tx_stop_queue`,
once `virnet_poll` schedules in such coincidental time,
the tx queue state will be cleared.
To solve this issue, adjusts the order of
function `virtnet_close` in `virtnet_freeze_down`.
Co-developed-by: Ying Xu <redacted>
Signed-off-by: Ying Xu <redacted>
Signed-off-by: Junnan Wu <redacted>
Message-Id: [ref]
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
LLM Generated explanations, may be completely bogus:
**Backport Status: YES**
This commit should be backported to stable kernel trees. Here's my
extensive analysis:
## Critical Bug Fix
This commit fixes a **use-after-free vulnerability** in the virtio_net
driver that can cause kernel panics during system suspend. The issue is
a race condition between the suspend process and active network traffic,
specifically:
1. **Race Condition Details** (from commit message):
- CPU-A calls `netif_device_detach()` which sets
`__QUEUE_STATE_DRV_XOFF` on TX queues
- CPU-B running `virtnet_poll()` can clear this flag via
`netif_tx_wake_queue()`
- CPU-A then calls `virtnet_close()` which disables NAPI and removes
virtqueues
- Later, when TCP delayed ACK timer fires, accessing the removed TX
virtqueue causes a panic
## Code Analysis
The fix is **minimal and contained** - it simply reorders two operations
in `virtnet_freeze_down()`:
**Before (buggy order):**netif_tx_lock_bh(vi->dev);
netif_device_detach(vi->dev); // Sets __QUEUE_STATE_DRV_XOFF
netif_tx_unlock_bh(vi->dev);
if (netif_running(vi->dev)) {
virtnet_close(vi->dev); // Disables NAPI - TOO LATE!
}
**After (fixed order):**
if (netif_running(vi->dev)) {
virtnet_close(vi->dev); // Disables NAPI FIRST
}
netif_tx_lock_bh(vi->dev);
netif_device_detach(vi->dev); // Then detach device
netif_tx_unlock_bh(vi->dev);
## Backport Suitability Criteria 1. **Fixes a real bug**: YES - Use-after-free causing kernel panics 2. **Small and contained**: YES - Only 8 lines moved, no logic changes 3. **No side effects**: YES - Just reordering existing operations 4. **No architectural changes**: YES - Simple ordering fix 5. **Critical subsystem**: YES - Network driver suspend/resume path 6. **Clear bug fix**: YES - Not a feature addition 7. **Minimal regression risk**: YES - The new order is logically correct (disable NAPI before marking queues stopped) ## Historical Context From git blame analysis: - The problematic code structure has existed since 2017 (commit 9fe7bfce8b3e11) - Recent changes in 2025 (commit e7231f49d52682) modified the locking but didn't fix the race - This indicates the bug has been latent for **years** and affects many kernel versions ## Impact Assessment - **Severity**: HIGH - Causes kernel panics during suspend with active network traffic - **Likelihood**: MODERATE - Requires specific timing but can happen with normal TCP traffic - **Affected systems**: All systems using virtio_net driver (VMs, containers) The commit already has "[ Upstream commit 45d8ef6322b8a828d3b1e2cfb8893e2ff882cb23 ]" indicating it's been identified for stable backporting, which further confirms its importance. drivers/net/virtio_net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 82b4a2a2b8c42..c9b18b13cd940 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c@@ -5728,14 +5728,15 @@ static void virtnet_freeze_down(struct virtio_device *vdev) disable_rx_mode_work(vi); flush_work(&vi->rx_mode_work); - netif_tx_lock_bh(vi->dev); - netif_device_detach(vi->dev); - netif_tx_unlock_bh(vi->dev); if (netif_running(vi->dev)) { rtnl_lock(); virtnet_close(vi->dev); rtnl_unlock(); } + + netif_tx_lock_bh(vi->dev); + netif_device_detach(vi->dev); + netif_tx_unlock_bh(vi->dev); } static int init_vqs(struct virtnet_info *vi);
--
2.50.1