From nobody Tue Feb 10 06:58:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1770371684; cv=none; d=zohomail.com; s=zohoarc; b=JYwGVURr/Sw37Mf1u86gPOtH0klQYPyiUJDwFdoX/4hVa4OCYHXU7gpi4HaYEHbcxdIt1CiuFrMRJq4aJjeKGKo+8VmQq/qlp0y1DwfIo2icIh6GiPl+fcVnPd4+3TAUrWTUT1uu2EnoOn8tsiVCnOf1JzIXTU1SamMMiteAzzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770371684; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=47AMJ66BenwafGkl5BaHY1yscXaiSSJ3Idhwisgb/xY=; b=SJeszyTv+ehaYOA4zqu517oIQyPYzw0bHDplxcg7JzvHNWFXCwfExZNKodA7Nkt3jv82hnMpgGUsesF3lm/ggXgU0ILgpUXHH+XEghVSU0RVYjMnGodPMDqdy4uRT3ILypI0M6tK608PXDxga9uUuMT/zGu/9gfvj+RH8Aj9ITU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177037168352425.20993270265467; Fri, 6 Feb 2026 01:54:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voIX9-0001sT-Ce; Fri, 06 Feb 2026 04:53:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1voIWi-0001mN-QD for qemu-devel@nongnu.org; Fri, 06 Feb 2026 04:53:28 -0500 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1voIWg-0000HV-HJ for qemu-devel@nongnu.org; Fri, 06 Feb 2026 04:53:23 -0500 Received: from mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1593:0:640:6beb:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 3B9538043B; Fri, 06 Feb 2026 12:53:21 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:52d::1:1f]) by mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 2rKPQc0AN0U0-9CimOJn0; Fri, 06 Feb 2026 12:53:20 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1770371600; bh=47AMJ66BenwafGkl5BaHY1yscXaiSSJ3Idhwisgb/xY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=U82z0nhmJlqlqhzgtX3s4m9Nhc32dUed0EF4SunLx0W1BxzNJa4ZRgIyF27/XMxit IXGPTmJpdUoKcDsQIqrW7Sfa5MwRVQdSMKBdxkalrvLquRY2grMKngc5Dgk+SBjqYJ BQxITac/FzE3egnYfJIoBxl54d2ywU/XsHJERtqs= Authentication-Results: mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: mst@redhat.com Cc: sgarzare@redhat.com, raphael@enfabrica.net, qemu-devel@nongnu.org, vsementsov@yandex-team.ru, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, Raphael Norwitz Subject: [PATCH v5 11/23] vhost: vhost_virtqueue_start(): fix failure path Date: Fri, 6 Feb 2026 12:52:45 +0300 Message-ID: <20260206095258.894504-12-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260206095258.894504-1-vsementsov@yandex-team.ru> References: <20260206095258.894504-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1770371685930158500 Content-Type: text/plain; charset="utf-8" We miss call to unmap in cases when vhost_memory_map() returns lenght less than requested (still we consider such cases as an error). Let's fix it in vhost_memory_map(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Raphael Norwitz --- hw/virtio/vhost.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index b89670e385..fed7c0f4ec 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -454,11 +454,20 @@ static inline void vhost_dev_log_resize(struct vhost_= dev *dev, uint64_t size) } =20 static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr, - hwaddr *plen, bool is_write) + hwaddr len, bool is_write) { if (!vhost_dev_has_iommu(dev)) { - return address_space_map(dev->vdev->dma_as, addr, plen, is_write, - MEMTXATTRS_UNSPECIFIED); + hwaddr mapped_len =3D len; + void *res =3D address_space_map(dev->vdev->dma_as, addr, &mapped_l= en, + is_write, MEMTXATTRS_UNSPECIFIED); + if (!res) { + return NULL; + } + if (len !=3D mapped_len) { + address_space_unmap(dev->vdev->dma_as, res, mapped_len, 0, 0); + return NULL; + } + return res; } else { return (void *)(uintptr_t)addr; } @@ -1314,22 +1323,22 @@ int vhost_virtqueue_start(struct vhost_dev *dev, } =20 l =3D vq->desc_size; - vq->desc =3D vhost_memory_map(dev, vq->desc_phys, &l, false); - if (!vq->desc || l !=3D vq->desc_size) { + vq->desc =3D vhost_memory_map(dev, vq->desc_phys, l, false); + if (!vq->desc) { r =3D -ENOMEM; goto fail_alloc_desc; } =20 l =3D vq->avail_size; - vq->avail =3D vhost_memory_map(dev, vq->avail_phys, &l, false); - if (!vq->avail || l !=3D vq->avail_size) { + vq->avail =3D vhost_memory_map(dev, vq->avail_phys, l, false); + if (!vq->avail) { r =3D -ENOMEM; goto fail_alloc_avail; } =20 l =3D vq->used_size; - vq->used =3D vhost_memory_map(dev, vq->used_phys, &l, true); - if (!vq->used || l !=3D vq->used_size) { + vq->used =3D vhost_memory_map(dev, vq->used_phys, l, true); + if (!vq->used) { r =3D -ENOMEM; goto fail_alloc_used; } --=20 2.52.0