From nobody Sat Apr 27 13:49:17 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=1585302166; cv=none; d=zohomail.com; s=zohoarc; b=RoHlGQj3of8vbRCMSvRwFg7WaEVCUevDprA0VIl6frr9OB+7JFAl4Rq5AKSMfMlUVE7qJ3wTAq7rGxSvVLKplR/a6SV8PMfeT1dJmiKcqaB24aawVJ3iH5y3xObb33RgHAKCCEp7HdoT+GBQY/ht6duIFjpZ9IPvD2R8Z8KUOCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585302166; 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=L9urmiOQNBVvIcgs/cMFL4+JJEirFU2LKdFqGQPpCHQ42YF8pJxpAaDd2W3L1R/Wdu+g1+Si6kls6s97kFfX5AXpdjKME102lIh2hIq7yWUbEnKwJGsEd7JlwFpvLMly1wYLcxlbV+DvebguL+y7eLSgI3r92gJ+rLKWgG/WBUo= 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 1585302166230925.3040538317955; Fri, 27 Mar 2020 02:42:46 -0700 (PDT) Received: from localhost ([::1]:39052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlVk-00077K-VI for importer@patchew.org; Fri, 27 Mar 2020 05:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58493) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlUX-0005Vh-VG for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:41:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlUW-0000hj-SH for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:41:29 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:48222 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHlUT-00008O-PU; Fri, 27 Mar 2020 05:41:26 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 7E3A3FB9F4D53A6B2C22; Fri, 27 Mar 2020 17:41:22 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 27 Mar 2020 17:41:15 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 1/2] virtio-blk: delete vqs on the error path in realize() Date: Fri, 27 Mar 2020 17:56:41 +0800 Message-ID: <20200327095642.18424-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200327095642.18424-1-pannengyuan@huawei.com> References: <20200327095642.18424-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 --- 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 Sat Apr 27 13:49:17 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=1585302173; cv=none; d=zohomail.com; s=zohoarc; b=hKPuabl6g226RunmYhM/jskEjSM+Z+JSkS6BXeXOo5FSpkseof8VZ5Pf/3IU8QWh366B9peMcZqPwCuxfNakypBuDTuzVC+YNtOt35UQS3rzIYPWG8ksGaxb9TD48s04eRQFINdsSp2lVKPEgu6T2liPQBtCJvG2F12O3EDD2/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585302173; 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=i6+SPZjsDWPMNXxzTr0xxMlrfKO4yDcxTDf21u3pXW0=; b=jwCUysv4MQt3T5fGYLwe0WHeJ8ISTiGUmjIohIkqe7JB67AESh7bK0qA8Oj9hUVnx2lHg6Yh3pqHrtHDqBo3cJepJqIDb/kRIPOGIKGNNHmT/+uNYbcYm0R8JlAR/Nibruj3XZ9ZxC1TeLWWvyr9JRUvud86DVOvGgxDmAYfap4= 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 1585302173505461.42111323523716; Fri, 27 Mar 2020 02:42:53 -0700 (PDT) Received: from localhost ([::1]:39056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlVs-0007Ig-Af for importer@patchew.org; Fri, 27 Mar 2020 05:42:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58535) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlUY-0005X9-Tp for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:41:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlUX-0000qf-T4 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:41:30 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:59668 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHlUX-0000d6-Hz for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:41:29 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 96FE8DFD26E2943A1E05; Fri, 27 Mar 2020 17:41:27 +0800 (CST) Received: from localhost.huawei.com (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 27 Mar 2020 17:41:18 +0800 From: Pan Nengyuan To: Subject: [PATCH v3 2/2] virtio-iommu: delete vqs in unrealize to fix memleak Date: Fri, 27 Mar 2020 17:56:42 +0800 Message-ID: <20200327095642.18424-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200327095642.18424-1-pannengyuan@huawei.com> References: <20200327095642.18424-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. And aslo do clean 's->as_by_busptr' hash table in unrealize to fix another = leak. Signed-off-by: Pan Nengyuan Acked-by: Eric Auger --- Cc: Eric Auger --- v3->v1/v2: - Aslo clean 's->as_by_busptr' hash table in unrealize.(Suggested by Stefan= o Garzarella) --- 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..694698fa0f 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -696,7 +696,10 @@ 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); + g_hash_table_destroy(s->as_by_busptr); } =20 static void virtio_iommu_device_reset(VirtIODevice *vdev) --=20 2.18.2