From nobody Mon May 6 15:20:57 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585284197; cv=none; d=zohomail.com; s=zohoarc; b=LtVNFIEMI/pNstQYQohyVy1LhWzm4uekTtgRj73cuj1uhRCb6IUkYMuuA5Jeld8gW86+o7yoyu4d3DyA43C6afnbJ1a+hQ96HFc+8rqCf3j4MgdcxjAIs7CiWrxMrNwBo6nZQ77hdLTY92fC/Xq7MxmPe3r3XblxQt5ZrhQznqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585284197; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T/RDVU/mQh/2A3umtMk7b2xjyLDNnQyP/yNO3ojnaJ4=; b=ibUDcV5Qf6h+Q9+ARJmDuznVfB6kY9BsCp9NW+o/VzMNpnCAlsiYyNwTs2XUk4tqJazillF1COo6Dft2/4Ax2B4jBcW7EnSLo99nWJ4kWgTW2Lu75pRNgR60+h8goMpPqqhWOPsGpxfhmnWj1GLRg2GcPRanOnAuLr/9/OYkroo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585284197518599.1227012075908; Thu, 26 Mar 2020 21:43:17 -0700 (PDT) Received: from localhost ([::1]:36972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHgpw-0003wY-6c for importer@patchew.org; Fri, 27 Mar 2020 00:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38904) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHgnr-0001hf-Ep for qemu-devel@nongnu.org; Fri, 27 Mar 2020 00:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHgnq-0003JM-Dn for qemu-devel@nongnu.org; Fri, 27 Mar 2020 00:41:07 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:43140 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHgnn-00036O-QM; Fri, 27 Mar 2020 00:41:04 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 487A8CDB59A613E1A6EC; Fri, 27 Mar 2020 12:40:58 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 27 Mar 2020 12:40:50 +0800 From: Pan Nengyuan To: Subject: [PATCH v2 1/2] virtio-blk: delete vqs on the error path in realize() Date: Fri, 27 Mar 2020 12:56:19 +0800 Message-ID: <20200327045620.9082-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200327045620.9082-1-pannengyuan@huawei.com> References: <20200327045620.9082-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , zhang.zhanghailiang@huawei.com, qemu-block@nongnu.org, mst@redhat.com, Pan Nengyuan , Max Reitz , Stefan Hajnoczi , euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" virtio_vqs forgot to free on the error path in realize(). Fix that. The asan stack: Direct leak of 14336 byte(s) in 1 object(s) allocated from: #0 0x7f58b93fd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7f58b858249d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x5562cc627f49 in virtio_add_queue /mnt/sdb/qemu/hw/virtio/virtio.c:= 2413 #3 0x5562cc4b524a in virtio_blk_device_realize /mnt/sdb/qemu/hw/block/v= irtio-blk.c:1202 #4 0x5562cc613050 in virtio_device_realize /mnt/sdb/qemu/hw/virtio/virt= io.c:3615 #5 0x5562ccb7a568 in device_set_realized /mnt/sdb/qemu/hw/core/qdev.c:8= 91 #6 0x5562cd39cd45 in property_set_bool /mnt/sdb/qemu/qom/object.c:2238 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Stefano Garzarella --- v2->v1: - Fix incorrect free in v1, it will cause a uaf. --- Cc: Stefan Hajnoczi Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org --- hw/block/virtio-blk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 142863a3b2..97ba8a2187 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -1204,6 +1204,9 @@ static void virtio_blk_device_realize(DeviceState *de= v, Error **errp) virtio_blk_data_plane_create(vdev, conf, &s->dataplane, &err); if (err !=3D NULL) { error_propagate(errp, err); + for (i =3D 0; i < conf->num_queues; i++) { + virtio_del_queue(vdev, i); + } virtio_cleanup(vdev); return; } --=20 2.18.2 From nobody Mon May 6 15:20:57 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585284121; cv=none; d=zohomail.com; s=zohoarc; b=mh/He8albKxTr/CUPTMysMyQx00gDdAJ5TZ2FbflRJkrAKDeeRQa8osrKEdzTx4Z5nFHLi6z8qCdDpsBUQ0uqwdeb/DDX0BkzheUpM9BSPkENLqhGvmRd+oUHhI4XyCpGykW8hATef/p368CJk8uZfq2tm3AlUeNyIZiAO2S4Ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585284121; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BsIviRG0VboJJBZy2QeMM8mNB7RHWRitPlSOAuYY8ho=; b=CI5oLL/UzUNC1zgfr+HCmGg0A1fc66z4tTRD9FkGoC04tQ0vnQHGgJppAE3xFOj696gdu6irYkC3hG1Beaz6NXRyhq9rRL/2UW+6p1W+VulNZH9N0vu4KpXdPZSh0M18p0o4wQ/7u9BzVmP+QKRvF3r8uKmEGns380SvWfPZEvU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585284121526700.6065199125483; Thu, 26 Mar 2020 21:42:01 -0700 (PDT) Received: from localhost ([::1]:36962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHgoh-0002Zs-C0 for importer@patchew.org; Fri, 27 Mar 2020 00:41:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHgnp-0001hA-1d for qemu-devel@nongnu.org; Fri, 27 Mar 2020 00:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHgnn-0003CN-Qt for qemu-devel@nongnu.org; Fri, 27 Mar 2020 00:41:04 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:43142 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHgnn-00033l-Fx for qemu-devel@nongnu.org; Fri, 27 Mar 2020 00:41:03 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 449544A81CAF0EEFD45A; Fri, 27 Mar 2020 12:40:58 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 27 Mar 2020 12:40:52 +0800 From: Pan Nengyuan To: Subject: [PATCH v2 2/2] virtio-iommu: delete vqs in unrealize to fix memleak Date: Fri, 27 Mar 2020 12:56:20 +0800 Message-ID: <20200327045620.9082-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200327045620.9082-1-pannengyuan@huawei.com> References: <20200327045620.9082-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Auger , euler.robot@huawei.com, Pan Nengyuan , zhang.zhanghailiang@huawei.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" req_vq/event_vq forgot to free in unrealize. Fix that. Signed-off-by: Pan Nengyuan Reviewed-by: Stefano Garzarella --- Cc: Eric Auger --- hw/virtio/virtio-iommu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 4cee8083bc..9d2ff0693c 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -696,6 +696,8 @@ static void virtio_iommu_device_unrealize(DeviceState *= dev, Error **errp) g_tree_destroy(s->domains); g_tree_destroy(s->endpoints); =20 + virtio_delete_queue(s->req_vq); + virtio_delete_queue(s->event_vq); virtio_cleanup(vdev); } =20 --=20 2.18.2