From nobody Fri May 3 22:24:09 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=1585356229; cv=none; d=zohomail.com; s=zohoarc; b=LMzDjiEgefdaebp72FJvnoRjbv1THBzMAeCtqLcz/1UxILZgKib+7xqqVG5AmgzGfeY/Judu5nJS94Y3L6hY98oxX0XWwrd65XtMok0yIadn5vUWcYuUe5/D7NrxroMAVRIRIQEpSPrvN/zJ4y+FSX5hiJOXxmvUIWUJei3Xo/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585356229; 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=Smb4zKWByqREnN35laRbxV8SKzZbLfMnziaC+ADVBNY=; b=UB81fgQMFWOKREsAaV1XQI5apLx64QOusYhhHflikQGLRjHCjnLzchYe8F90QvDO2iq2+EL3eIRYHTUb10mxjHMXTAJhCJ+SfCfoH+obgwoSBT8zp2OipjPiZClAgy2wA9v332uYwPNJ551BL5LimQTzNTATGVsxqAg151gQHk0= 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 1585356229231415.40947886883544; Fri, 27 Mar 2020 17:43:49 -0700 (PDT) Received: from localhost ([::1]:48746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHzZk-0005CA-1X for importer@patchew.org; Fri, 27 Mar 2020 20:43:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41553) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHzXr-0002v1-SX for qemu-devel@nongnu.org; Fri, 27 Mar 2020 20:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHzXq-0003VH-Rv for qemu-devel@nongnu.org; Fri, 27 Mar 2020 20:41:51 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:60104 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHzXo-0003JG-5M; Fri, 27 Mar 2020 20:41:48 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 866311A016A7AA4F458A; Sat, 28 Mar 2020 08:41:45 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 28 Mar 2020 08:41:34 +0800 From: Pan Nengyuan To: Subject: [PATCH v4 1/2] virtio-blk: delete vqs on the error path in realize() Date: Sat, 28 Mar 2020 08:57:04 +0800 Message-ID: <20200328005705.29898-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200328005705.29898-1-pannengyuan@huawei.com> References: <20200328005705.29898-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.35 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 Reviewed-by: Pankaj Gupta Reviewed-by: Stefan Hajnoczi --- 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 Fri May 3 22:24:09 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=1585356157; cv=none; d=zohomail.com; s=zohoarc; b=WkB7D8sQoh4i3RTSSx4r002jY8TkqQ3wrV2DbB1F/EeCademUHX4KOWppmMvzZL2s4fjCNBUmt0SYkPBugYDrGHeib8i3VlI2yRD7vi4yDbEiCv+ndbHjuuU3T80hRmZ0wJNGoZNyxAd8Y3IiHoDyQAdOhHSoWpn3RmS/2CDPqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585356157; 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=94tU5gldQ2zfGm5EJ8r/5ks0U/Xhir/3r4V+lz+jzRI=; b=QoV7gVp8SA9ATH3rd7v12lYomFyXbpASrJeyACq82hboVT3pV5ZsLNpFJfrZpIbF3cXuCmfrTn68T+l9wwl0aTv0AiHrdB1pEb09hfxK6irRgvZFwBx3cc0rREvp+uBb+2qPno6aszhhCn9me4vuM6swNbaQmQvub3lHIXWtFnQ= 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 1585356157302274.97585145414143; Fri, 27 Mar 2020 17:42:37 -0700 (PDT) Received: from localhost ([::1]:48736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHzYZ-0003qV-Sq for importer@patchew.org; Fri, 27 Mar 2020 20:42:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41529) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHzXp-0002s5-EW for qemu-devel@nongnu.org; Fri, 27 Mar 2020 20:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHzXo-0003QP-Fg for qemu-devel@nongnu.org; Fri, 27 Mar 2020 20:41:49 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:60100 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHzXo-0003JF-4v for qemu-devel@nongnu.org; Fri, 27 Mar 2020 20:41:48 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 81D9DE7336605BBEBF04; Sat, 28 Mar 2020 08:41:45 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 28 Mar 2020 08:41:36 +0800 From: Pan Nengyuan To: Subject: [PATCH v4 2/2] virtio-iommu: avoid memleak in the unrealize Date: Sat, 28 Mar 2020 08:57:05 +0800 Message-ID: <20200328005705.29898-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200328005705.29898-1-pannengyuan@huawei.com> References: <20200328005705.29898-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.35 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: zhang.zhanghailiang@huawei.com, mst@redhat.com, Pan Nengyuan , Eric Auger , 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" req_vq/event_vq forgot to free in unrealize. Fix that. And also do clean 's->as_by_busptr' hash table in unrealize to fix another = leak. Signed-off-by: Pan Nengyuan Acked-by: Eric Auger Reviewed-by: Stefano Garzarella --- Cc: Eric Auger Cc: Stefan Hajnoczi --- v3->v1/v2: - Also clean 's->as_by_busptr' hash table in unrealize.(Suggested by Stefan= o Garzarella) v4->v3: - update subject msg and move g_hash_table_destroy to the beginning of unre= alize. --- hw/virtio/virtio-iommu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 4cee8083bc..22ba8848c2 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -693,9 +693,12 @@ static void virtio_iommu_device_unrealize(DeviceState = *dev, Error **errp) VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIOIOMMU *s =3D VIRTIO_IOMMU(dev); =20 + g_hash_table_destroy(s->as_by_busptr); 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