From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f51.google.com (mail-dl1-f51.google.com [74.125.82.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B4183C09E2 for ; Sat, 17 Oct 2026 11:42:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792237381; cv=none; b=G3GMwBVZdMVUTshdD8BI/LHSDEm4oJBrPbPUFsQydn0m3tHFQjLS9ykKBQpADEAFp6dQ2MYYu1+ZEHwvF9Pdj4twCyC5ZOo7lF1sJNgDOLggLI5L6OhhoCyDCiDElzE98cUeHyRadjEvB5S+6eFzek8I046h5Bz4QLExq2HppxY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792237381; c=relaxed/simple; bh=J8Cw60wlKHa0M+RZVGRfThuU+pMFQ4l3jfsZspjxnx4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=orKLUlVyrFvGk/LXSJ+ugsC3zNPoJ6OWIFTcKN1ogq/GiXK8j1zb77ex2r7n7RFqgCl3b795ZAMjpbdCh0l6KM3WN0snzZFeMHXXs82/e4WYvQgyoSrIu/h5t8GcOFXhD8kOQrJRDziDjXqG5Psx1LEhvOKFxhrJnqYXu5tCrvc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LQ+FrjmR; arc=none smtp.client-ip=74.125.82.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LQ+FrjmR" Received: by mail-dl1-f51.google.com with SMTP id a92af1059eb24-1517bda04a0so577802c88.0 for ; Sat, 17 Oct 2026 04:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792237379; x=1792842179; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=/NEtd/XspvBJIHQm0kcPRGhqlPpCGmhp+4zMFyvkec0=; b=LQ+FrjmRiBrmkwZiew7tTvS0pohugggoXlUc6g9D1evS65lJehstBnMxP7pdl9BQ++ txdsfYNfJvnGOc4+q0vUBvR36RvPGAK75XYU8a7ku6s3wPOKJZ7cEJT5DM2LOIRCJblW q7PXrrg/02n88Qpup77lPUbWZ1ZtBDIHO2dmxO/PSYwNArKDOQo3AMwROxhNu+tcz2Dg 3YnHPIVqkQ6slo9JzuouCP1yRvlqgwfP+EcV+OowXas/QSoCj7noII7i2v/MSlpjv2Jl W3HirFlpnkKacLQdmDB+abp6Wm9bQvsvEEanIfg6O1lJVE7kWCLjVFfyO2fg2JGMbuYl Z07w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792237379; x=1792842179; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/NEtd/XspvBJIHQm0kcPRGhqlPpCGmhp+4zMFyvkec0=; b=CtMFVly9WVGJQm8r714oZ6Z6gIPkw56eTN9ktsXU+TlJ2hCx2fkBg6hh0CfhiwMUAj iP1r/XnWa7PK4z3QaPSp2iPTO5RcFF2VxOsxWULjseouUYiCJ5W9x10PvMU4P/zGiq9D CYxTASbTr9Rb3vY8dt6dkfN+FhlSYP6hhA1H5P1Nemp5c+0o7DuBAXjUoTnXa1vvH8MN y9BifUqhK9nXAyQFO516tiOPM2zxHPPbHIM8RtcQneKy4VF1TqS++GfcAITRmIr7qpXo awCygRPHEhUmXOrMUpFoxH/+MGXB72tiJJDpaAlwRmnqbSlenZ58bwiIkxWoRHJLm5Ny PIYA== X-Gm-Message-State: AFq9FYJzxwNpjAntKrYr+Ni5Wio5Oh31+JZO5QG3gyiU2DW9mnKY/yAC KwQwS2YAPiglsOB1jdF68xk1n91HVSTUEE5uhGQ61z8SfcPANlW+Sz5D X-Gm-Gg: AYBFou2Wh8D7JE/OBIZNcvoyNNt6qoBWpPgaIScTwp5yNfuO5t4Pq0GSZbzCRo2YgFZ XVA5Rks5Bb6mt4nqWqZ6ozyNhpbR3HRClMOl7RQWaqg4+XKYftqFl8xKTjjRshk9LjVw350s88O iB78aDuGc3EG65fzVbytl4xb9Z/vBIz6yYh9Rk4y7peVY77yj9nx8q6MjtHMOQdvdVuaab97UHA S0266Bh6xrTcF36Sv7c78fcYx6uU5xCr7LQP0FgwPLS00gvTHnQ3VYc701p6ioNjrUzbcw+k2rm zIM5WGYVqF4YEXMSZMx/bIGg8SMrSaK3zqZ25xclQj+jCvbhtULU0j/CNY6VzX84hCwjtTNBXji LsPgg7O+Y3XypVxdK97j8PhMnrVCDO7BeYXSw9xGA0MfohX3baB+A+Mbo/s9CepyHVM10Xxgtcm xP8CpzJV0IcmZ6Rpk2Y7RLA2VJWxqAGC4/S3mZkx7lqgxQQssPeBYK5JJM6FHZQ7GqYmD1+MSQa EWfJP6MyTv5rjOLo9azdO3ZEkCu0AtOZuFdVNj5kgmFwoY= X-Received: by 2002:a05:701b:4559:20b0:144:eb46:c31 with SMTP id a92af1059eb24-185120abebbmr3391009c88.17.1792237378928; Sat, 17 Oct 2026 04:42:58 -0700 (PDT) Received: from Terra.tail0ac356.ts.net ([198.176.50.208]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1831996071csm13759881c88.9.2026.10.17.04.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 04:42:57 -0700 (PDT) From: Weiming Shi To: "Michael S . Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Shannon Nelson , Xiang Mei , Weiming Shi , stable@vger.kernel.org, co+d17c2bc750a9cbbb@bugs.sh Subject: [PATCH net] virtio_net: atomically disable rx mode work Date: Sat, 17 Oct 2026 04:42:38 -0700 Message-ID: <20261017114237.2786302-2-bestswngs@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit virtio-net uses a boolean to gate rx_mode_work during device teardown. The flag is changed under RTNL, but ndo_set_rx_mode checks it under the address-list lock. A callback can therefore pass the check and enqueue work after teardown has flushed it. The work is also enabled before late probe operations that can fail, allowing probe unwind to free the netdev with work still queued. KASAN reports the worker using a virtqueue that probe unwind already freed: BUG: KASAN: slab-use-after-free in virtqueue_add_split Workqueue: events virtnet_rx_mode_work Call Trace: virtqueue_add_split (drivers/virtio/virtio_ring.c:706) virtqueue_add_sgs (drivers/virtio/virtio_ring.c:2839) virtnet_send_command_reply (drivers/net/virtio_net.c:3565) virtnet_rx_mode_work (drivers/net/virtio_net.c:3833) process_one_work (kernel/workqueue.c:3322) worker_thread (kernel/workqueue.c:3405) Freed by task 119: kfree (mm/slub.c:6625) vp_del_vq.isra.0 (drivers/virtio/virtio_pci_common.c:259) vp_del_vqs (drivers/virtio/virtio_pci_common.c:285) virtnet_probe (drivers/net/virtio_net.c:7129) Use the workqueue disable mechanism to atomically reject new queue attempts and drain running work. Keep work disabled until probe succeeds or restore has reattached the netdev, then enable it and replay receive-mode state for a running interface. Disable it before resource teardown in freeze and remove. Fixes: b9f7425239a0 ("virtio-net: convert rx mode setting to use workqueue") Cc: stable@vger.kernel.org Reported-by: Assisted-by: LLM Signed-off-by: Weiming Shi --- drivers/net/virtio_net.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7d2eeb9b122667..6fa4b7219aa5ac 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -441,9 +441,6 @@ struct virtnet_info { /* Work struct for setting rx mode */ struct work_struct rx_mode_work; - /* OK to queue work setting RX mode? */ - bool rx_mode_work_enabled; - /* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set; @@ -710,16 +707,13 @@ static void virtnet_rq_free_buf(struct virtnet_info *vi, static void enable_rx_mode_work(struct virtnet_info *vi) { - rtnl_lock(); - vi->rx_mode_work_enabled = true; - rtnl_unlock(); + if (enable_work(&vi->rx_mode_work) && netif_running(vi->dev)) + schedule_work(&vi->rx_mode_work); } static void disable_rx_mode_work(struct virtnet_info *vi) { - rtnl_lock(); - vi->rx_mode_work_enabled = false; - rtnl_unlock(); + disable_work_sync(&vi->rx_mode_work); } static void virtqueue_napi_schedule(struct napi_struct *napi, @@ -3894,8 +3888,7 @@ static void virtnet_set_rx_mode(struct net_device *dev) { struct virtnet_info *vi = netdev_priv(dev); - if (vi->rx_mode_work_enabled) - schedule_work(&vi->rx_mode_work); + schedule_work(&vi->rx_mode_work); } static int virtnet_vlan_rx_add_vid(struct net_device *dev, @@ -5711,7 +5704,6 @@ static void virtnet_freeze_down(struct virtio_device *vdev) /* Make sure no work handler is accessing the device */ flush_work(&vi->config_work); disable_rx_mode_work(vi); - flush_work(&vi->rx_mode_work); if (netif_running(vi->dev)) { rtnl_lock(); @@ -5741,8 +5733,6 @@ static int virtnet_restore_up(struct virtio_device *vdev) virtio_device_ready(vdev); - enable_rx_mode_work(vi); - if (netif_running(vi->dev)) { rtnl_lock(); err = virtnet_open(vi->dev); @@ -5754,6 +5744,8 @@ static int virtnet_restore_up(struct virtio_device *vdev) netif_tx_lock_bh(vi->dev); netif_device_attach(vi->dev); netif_tx_unlock_bh(vi->dev); + + enable_rx_mode_work(vi); return 0; err_destroy_pools: @@ -6849,6 +6841,7 @@ static int virtnet_probe(struct virtio_device *vdev) INIT_WORK(&vi->config_work, virtnet_config_changed_work); INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); + disable_work(&vi->rx_mode_work); if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { vi->mergeable_rx_bufs = true; @@ -7007,8 +7000,6 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); - enable_rx_mode_work(vi); - for (i = 0; i < ARRAY_SIZE(guest_offloads); i++) { unsigned int fbit; @@ -7112,6 +7103,8 @@ static int virtnet_probe(struct virtio_device *vdev) goto free_unregister_netdev; } + enable_rx_mode_work(vi); + pr_debug("virtnet: registered device %s with %d RX and TX vq's\n", dev->name, max_queue_pairs); @@ -7164,7 +7157,6 @@ static void virtnet_remove(struct virtio_device *vdev) /* Make sure no work handler is accessing the device. */ flush_work(&vi->config_work); disable_rx_mode_work(vi); - flush_work(&vi->rx_mode_work); virtnet_free_irq_moder(vi); -- 2.55.0