OpenVZ / Virtuozzo kernel development (devel@openvz.org)
 help / color / mirror / Atom feed
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: andrey.zhadchenko@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH hci-8.1 v4 1/2] drivers/vhost: fix a use-after-free of VHOST_SET_NWORKERS workers
Date: Mon, 16 Nov 2026 09:51:38 +0100	[thread overview]
Message-ID: <20261116085139.2848797-2-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20261116085139.2848797-1-alexander.ivanov@virtuozzo.com>

vhost_set_workers() and vhost_propagate_workers() store workers into
vq->worker directly, bypassing __vhost_vq_attach_worker(). The workers
they install keep attachment_cnt at 0, and the default worker keeps
counting every vq. VHOST_FREE_WORKER then destroys a worker a virtqueue
still points at, and the next vhost_vq_work_queue() on that vq is a
use-after-free. VHOST_ATTACH_VRING_WORKER on such a vq drives
attachment_cnt of its worker to -1. vhost-scsi already exposes both
interfaces to the device owner.

Attach the workers with __vhost_vq_attach_worker(), so VHOST_FREE_WORKER
fails with -EBUSY while a vq uses the worker and both interfaces can
coexist until userspace moves to the worker ioctls. Userspace issues
VHOST_SET_NWORKERS before VHOST_SET_VRING_KICK, so the attach takes the
path without synchronize_rcu() and VM startup is not slowed down.

The attach dereferences the worker, so skip a source vq whose worker
was killed, and reject VHOST_SET_NWORKERS on devices that do not use
workers. On vhost-vdpa every vq->worker is NULL, and the workers
vhost_set_workers() created there were never freed.

https://virtuozzo.atlassian.net/browse/VSTOR-107537
Fixes: 705a4b3eefde ("drivers/vhost: add ioctl to increase the number of workers")
Feature: vhost-blk: in-kernel accelerator for virtio-blk guests

Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
 drivers/vhost/vhost.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 1057ba7e3fc7..422cac6f2298 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1094,7 +1094,12 @@ static void vhost_propagate_workers(struct vhost_dev *dev, int nworkers)
 	int i, j = 0;
 
 	for (i = nworkers; i < dev->nvqs; i++) {
-		dev->vqs[i]->worker = dev->vqs[j]->worker;
+		struct vhost_worker *worker;
+
+		worker = rcu_dereference_check(dev->vqs[j]->worker,
+					       lockdep_is_held(&dev->mutex));
+		if (worker)
+			__vhost_vq_attach_worker(dev->vqs[i], worker);
 		if (++j >= nworkers)
 			j = 0;
 	}
@@ -1117,7 +1122,7 @@ static int vhost_set_workers(struct vhost_dev *dev, int n)
 			ret = -ENOMEM;
 			break;
 		}
-		dev->vqs[i]->worker = worker;
+		__vhost_vq_attach_worker(dev->vqs[i], worker);
 	}
 
 	vhost_propagate_workers(dev, i);
@@ -2445,7 +2450,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
 		r = get_user(n, (int __user *)argp);
 		if (r < 0)
 			break;
-		if (d->workers_set) {
+		if (!d->use_worker || d->workers_set) {
 			r = -EINVAL;
 			break;
 		}
-- 
2.53.0

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

  reply	other threads:[~2026-11-16  8:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16  8:51 [Devel] [PATCH hci-8.1 v4 0/2] drivers/vhost/blk: add support for worker ioctls Alexander Ivanov
2026-11-16  8:51 ` Alexander Ivanov [this message]
2026-11-16  8:57   ` [Devel] [PATCH hci-8.1 v4 1/2] drivers/vhost: fix a use-after-free of VHOST_SET_NWORKERS workers no-reply
2026-11-16  8:51 ` [Devel] [PATCH hci-8.1 v4 2/2] drivers/vhost/blk: add support for worker ioctls Alexander Ivanov
2026-11-16  8:57   ` no-reply
2026-11-16 17:29 ` [Devel] [PATCH hci-8.1 v4 0/2] " Konstantin Khorenko
2026-11-17 14:40 ` Konstantin Khorenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261116085139.2848797-2-alexander.ivanov@virtuozzo.com \
    --to=alexander.ivanov@virtuozzo.com \
    --cc=andrey.zhadchenko@virtuozzo.com \
    --cc=devel@openvz.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox