From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 6915B803BB for ; Mon, 16 Nov 2026 08:53:06 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG8pk7h021567; Mon, 16 Nov 2026 11:51:48 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG8pk7h021567 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="FW7SVSnl" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG8pigS021556 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 11:51:45 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG8pigS021556 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4915ba023d4so1396824f8f.0 for ; Mon, 16 Nov 2026 00:51:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErHXsWuDRBOgfDx0IuoRDqUXdA+Px9KAVl0sLXFL8UpCBxCgk0FKzgnIfbzbsbCU/UTIHYSzOQ==@openvz.org X-Gm-Message-State: APuU4Z+RdTDJn1wfInti+godoplwtnPA74+zn8bHxawiUs8aQYq6fX+w oO0f3wg/cMqtVPcncdiQ8gcevlZawefcC6LkLk+O/qCUIKxrqy5rjO6JrgLNM3objb/YX07vA8B zWPWQCgHgeVEaIzhs06p0HL6T01u54guYG4WekjW+Kw+Qeqp6KcvGFA== X-Gm-Gg: AZFdTZdDD2Xsfx9QF/rd5rwbwY94XDVTsMSz5ldM7ZxCjvkHKfkuGQgsmmWELfyFOQI XiMkyLlxfv88gUfLrEHHQuM9jeBxzWScC/dFwT7WAFXvf5hGbVGiQy8kh+9QYKy5losavWMfXYs XUQsI0zrg8vM78//95esw3Q/S9JVEVJLfX0zvWmsv31m4sZu54R5/phLNY+8T8nspFCJp7L2XWR tUxwOz2fRtn/GG8wj9Etm2SZJ86Tq9rxFzsHpPR2Ww5BuCXhNxE83pcx/JCWu06LJLL5PlG4E1t xh3EwxZ9akAtOPOWkLri1mVTnpCat2KvkQTvNW0GRuzBfqwamsLN5BWzk49L78G2eMhtbXIILWP hlW6zVHYfOaSztX6RhM685ucPMp4= X-Received: by 2002:a5d:5846:0:b0:48e:cd3:64f8 with SMTP id ffacd0b85a97d-49dfd36c520mr15930980f8f.4.1794819104342; Mon, 16 Nov 2026 00:51:44 -0800 (PST) X-Received: by 2002:a5d:5846:0:b0:48e:cd3:64f8 with SMTP id ffacd0b85a97d-49dfd36c520mr15930941f8f.4.1794819103820; Mon, 16 Nov 2026 00:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794819103; cv=none; d=google.com; s=arc-20260327; b=klGk9aRpuZ0VdwddnUxlH/V4+azWalA8UOPxzGDbxy2p5zR+RLaPl79/PP5BOy2zf+ tAj5iX189HVdx/dTOBIy7eR5USya9+1IuBrdO2UnlLgSKdQBGtG0XKJIQkycOmjlk1+e 3tNYWog50c2yTQUr+QB9i/oYtfpk2dpspAEW30MsthNfeVTgIwFRPshNW/LLYeBzFWGO MlQMgEGa7L+0p+XQGzh7OaXVeYkW0NZ4tVmbQHwJ4bLyk1K6RPlRNiKqQPJdCZEm6vbT SqbI2ckRaei4MTobkXfw1Zu99OdHZODlSWHpp9sTSpm4n9HXnO9xzpPg3QhlVDK4bM32 TIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=b0pJEnxbdFGDAJLNwFFQuj49KkLmt03/Zq+871LqQbk=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=NlNsKZyappMjCSFhHSI2bClGiu91WvOKDF8i6zeuPNwYfrWrCRUMmP/liZhP5VrZ2f eGrdmqA+ZQo+u2JmitjqvqaVRQpsnh+p0orHaySXJ/9ARwMtImnQxeZDHv+BqWPEFtTe R+3/Wk9PGfl8bUTGu6rClGJMqIw9uvmoYhdUWOiqj6n62SJejd+/uWV1FGQeRwghs2SB +K+sOJEVzQBE/5rNs8Qyiz9/hOqt60GPgjhJXx0rmcCx13dIA5wbOfppeN7xPX+g0gM6 LJP5kHFWjFtcF9WMR8P+L+3YTjobzV1G1IS+SxL/aBKcwwpdK2KZfqEefqSWRy2/8cgm W3Fw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=FW7SVSnl; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c60115851si19931959f8f.29.2026.11.16.00.51.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 00:51:43 -0800 (PST) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=FW7SVSnl; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=b0pJEnxbdFGDAJLNwFFQuj49KkLmt03/Zq+871LqQbk=; b=FW7SVSnlryjO x+v094sIcWnxw1S8QxzaQObTZbN85GCUwVwbyDTlzyX4SNWi6p/mA322KJxGdaf3iwgO07h8lMhw3 GJwmk61I2C0v/q7F/jkC91++D2jCcQH/fIWV10qVdHZw7a0otJb5vPgR9PevVcKXEBo6NvVI4siIP XoEFqwxAGVmbe53J/gFB4f98gKOFGwt7HBRnXS2ZialF/KKQm/GJcp+0v48m7L3/bfqvufipqO1cL OXLMBFTtmTUJOlk385yBnL1Uu1jx1Ta+Hp+NdxFE7INxqNKyEEjmxQ7oZSGphe6EWf3g+JFt22Y50 nmCAHOeCUgQMI8qDUlclvQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xSsMy-00Fihg-2e; Mon, 16 Nov 2026 09:51:35 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 16 Nov 2026 09:51:38 +0100 Message-ID: <20261116085139.2848797-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261116085139.2848797-1-alexander.ivanov@virtuozzo.com> References: <20261116085139.2848797-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true 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 X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org 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 --- 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