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 4EE72803BB for ; Sun, 15 Nov 2026 13:42:40 +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 6AFDeMiE013087; Sun, 15 Nov 2026 16:40:23 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AFDeMiE013087 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Qj/84yeL" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AFDeGSq013070 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Sun, 15 Nov 2026 16:40:16 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AFDeGSq013070 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4930269afdcso1752848f8f.2 for ; Sun, 15 Nov 2026 05:40:16 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErFOsza/j+1CerIvpCnTMtdXRZouZNmdworeCXfd3or7wsP8ktW9DKT1GJN0Kbmv0VAbWOC2Lw==@openvz.org X-Gm-Message-State: APuU4Z/y6V8h7NwhidopffeIL0B6sUph8ujtEmrEMaqHnUggdp9XetD4 qkCiMb17tNfzTOENKO9LIsqPRDNqwCueX+sKYvm/ivNFlOy73TRIF3ks/PH3XBCSYa8lsdZ9cvL 5RUbYLhPtVQQAqnHybcY8HHGHyfx9mPbRMXgUXSyi85PmDaFmX4SqLQ== X-Gm-Gg: AYBFou3M7hXVo4J2IUm7MBI0cwEC7AySNnZ4q9AScOlCeqIVDoiFhPDiWxYEvwxEjV7 gcQ/iRJuAV5v4XaUIfrh639dA+6qPuafaSrF/YRdioH2/GGnHjZiafOwPoEBYkJIZka306Ht3nd 9/fwRIx7gW4XKV0vH8WxPeU/HFwj9xxioCiLOvUNgohAoMZ8VeYNay1wOkgMvctfQffpRB6L5WW F1LlAv/b8orH8mH6fd4uSlsoXn02UCcLbrietFWIz+uiUZ4fGKxRo9ewj1ikABDkzn9vWdOwsRG DKYCHD+5wFakYpCzVMh8M4ULN5y2nTIHo47TVOLRMHVtoEXYKSrf4rpclTggb3vBKpCvFQNNtyZ eErusSKisLeQr0xM6id1puCIEx9E= X-Received: by 2002:a05:6000:2508:b0:488:7496:15b5 with SMTP id ffacd0b85a97d-49c72c9bf9fmr18841210f8f.47.1794750016416; Sun, 15 Nov 2026 05:40:16 -0800 (PST) X-Received: by 2002:a05:6000:2508:b0:488:7496:15b5 with SMTP id ffacd0b85a97d-49c72c9bf9fmr18841144f8f.47.1794750015833; Sun, 15 Nov 2026 05:40:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794750015; cv=none; d=google.com; s=arc-20260327; b=GCl5WXncXEXp42l5GeKTOF0uZhPCeQZhmpoP/ycKHgdMiG+ZbBuBFTKHUlWo63TA3F 8UjSf3ClcuCdo3as18EJIxuV1lXhvJgzzTLveec8VWo6vjVmTo+lRTtasiZosdGK2UCq yGt4f2sQLRnoEvS6oQjsbUDGchgfajwkz+vxpw+9MS4c9i3MHTdgt5Zp0736Oou/rh11 OZPHJb0+QgvlycWSmER/pzDx40/QFVSSTCA0p+PTsq96rdcpn425iULQNDQ+WMIf2rKn nCh34lQp+KJ/Uei2rTaCue17z5MNW2NKpVmEa0SBLLXPNB3Bi34f0oFMl7LCcpEzc4qx 4T/w== 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=mN2WkFLLqjFfU2e4RNQ2S23sPwRZaYyofT8RMK+WX0Q=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=Z8sb1ZY9/6zCJPk8LQrSmwkKqNhpV8cQ7vFMF9G+W4hF2fhf+X4Mgh4+rSqrwhk2FT co/mLk5RInJiNaAJbfH7o2vWTnNCzEcI77WTnS1+ROxuaZHhshUYd5Utk2UbxxJlPRcb oCI2WISkfx5UYw8+LkrrqsB+sXxEp7ILA7y064r6GR67dbbeSSkx/ncA6snMbh/DCfis +ZBgxxtDBPsLdfpIzkMnziaf5Y07Jt7Zab0a3exhP0iw7pFw9PXSScO9YmY7krgFTrKe qB+D3X5CqPCsJG7U6lzhxqgzJNEOv00EvieycF65diTbb4PFhR24FgkrRg2v/Domg6nM AGMw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="Qj/84yeL"; 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-49c63122e23si16590587f8f.72.2026.11.15.05.40.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 05:40:15 -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="Qj/84yeL"; 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=mN2WkFLLqjFfU2e4RNQ2S23sPwRZaYyofT8RMK+WX0Q=; b=Qj/84yeLXKFw PA7mnQlNK4AcRnc6orQLO3zclRoHVgl5xP8Nx7q9tJ0qUV0uZayrWCqQzsMg8EpDykLs8uR6PIJwf 4nHg7dZjcxY+XrPp/5WbW9PFJkXUex6NF2+Ls1/HWHxS5sKSoDTCj4bF7FMyc4ga41zgc2p6jqnZu mRnlTYw97qMJ3h/AL6M4uoKPCtt0uepVhmIqQ+UN2cmZFPZw4z74AJRVET2vKP1q/8Bg4f4Gw17eS r4lE+q5gdpyNKxHpafpeq2FoUKTYox41U9jjeV19jqT7QMOqtm57LVo05ka2D/P8S87DN7wKEXh8T mz+Y29Hya6LO/WZ0bdf3qw==; 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 1xSaOg-00BXKW-09; Sun, 15 Nov 2026 14:40:08 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Sun, 15 Nov 2026 14:39:56 +0100 Message-ID: <20261115133957.2803273-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261115133957.2803273-1-alexander.ivanov@virtuozzo.com> References: <20261115133957.2803273-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 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: 1491588e71da ("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