From nobody Mon Apr 29 01:34:26 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=1579241465; cv=none; d=zohomail.com; s=zohoarc; b=OjxKe/WmFGzR4x8smRIi/df2pR97fBSssFx4us54moY4YxRSR8myuvDt1Q/NLzlcYbyv+5XWUMsYmyd9rrrd0sS5EgFgHCT0T9gClZJu29sRQBpCgXKgrY+5QwemEjQM6xhBtB+y3Fl4YfGmKnQ5Hojywq8thu6/iWWPlvi10w0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579241465; h=Content-Type:Content-Transfer-Encoding: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=L7V0whLt/Y/xTmWr0jmTLBWHn5zosv5urWBirc8Bl7g=; b=jv1AKCysDqM2KlQWh01d7ZMm/AEMpYOfPssn5ogUv56jthUqahP9RnN7JCBOLMXJPGKImVRhfMu2XlDnV1e//d/i1eAeNkbuK0tCa0iYN1fHaq9TupH/4WCBCoGdYEBBIfowDv2t6DSOoWwJ/iZ3KbMenyz1Kvi/C+7zxSESz3I= 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 157924146554040.059786419429656; Thu, 16 Jan 2020 22:11:05 -0800 (PST) Received: from localhost ([::1]:52876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isKqV-0002ys-6v for importer@patchew.org; Fri, 17 Jan 2020 01:11:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49461) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isKpP-0001zg-Lk for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isKpM-0005m9-7T for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:55 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2682 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isKpL-0005jS-T1 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:52 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2714B9DA85DC519D696C; Fri, 17 Jan 2020 14:09:48 +0800 (CST) Received: from DESKTOP-9NTIQGG.china.huawei.com (10.173.221.136) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Fri, 17 Jan 2020 14:09:37 +0800 From: To: , Subject: [PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize Date: Fri, 17 Jan 2020 14:09:26 +0800 Message-ID: <20200117060927.51996-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200117060927.51996-1-pannengyuan@huawei.com> References: <20200117060927.51996-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.173.221.136] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: Euler Robot , Pan Nengyuan , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan v->vq forgot to cleanup in virtio_9p_device_unrealize, the memory leak stack is as follow: Direct leak of 14336 byte(s) in 2 object(s) allocated from: #0 0x7f819ae43970 (/lib64/libasan.so.5+0xef970) ??:? #1 0x7f819872f49d (/lib64/libglib-2.0.so.0+0x5249d) ??:? #2 0x55a3a58da624 (./x86_64-softmmu/qemu-system-x86_64+0x2c14624) /mnt/s= db/qemu/hw/virtio/virtio.c:2327 #3 0x55a3a571bac7 (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7) /mnt/s= db/qemu/hw/9pfs/virtio-9p-device.c:209 #4 0x55a3a58e7bc6 (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6) /mnt/s= db/qemu/hw/virtio/virtio.c:3504 #5 0x55a3a5ebfb37 (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37) /mnt/s= db/qemu/hw/core/qdev.c:876 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Acked-by: Greg Kurz Reviewed-by: Christian Schoenebeck --- Changes V2 to V1: - use old function virtio_del_queue to make it easier for stable branch to merge (suggested by Christian Schoenebeck) --- hw/9pfs/virtio-9p-device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index b5a7c03f26..910dc5045e 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -215,6 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev= , Error **errp) V9fsVirtioState *v =3D VIRTIO_9P(dev); V9fsState *s =3D &v->state; =20 + virtio_del_queue(vdev, 0); virtio_cleanup(vdev); v9fs_device_unrealize_common(s, errp); } --=20 2.21.0.windows.1 From nobody Mon Apr 29 01:34:26 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=1579241521; cv=none; d=zohomail.com; s=zohoarc; b=dMVhFlfod5RNbeqehQ3C+1yRc0nKQCkloDd9rqtGNfPqMZBliZIAOKnA/ST9vOZr0tN9krBqpiQBCkjmLHNkccstQJcDVNBp2ffr/W6DyWI+ZcRlW73PYU8xedHhBT+yGsGxxBIhG7NL1A7CenGGH99zMpwda+ZWD3EvGGY2vk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579241521; h=Content-Type:Content-Transfer-Encoding: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=fNiS/lXRlZZz/osGyBxmIHXhO+BAHabKUTtQU247ifU=; b=PNOxyklMFZJNIPBpHhr2ldZyMiPcDtkGYsix4RKIXevShtEK9tme1IOyQpTwLuK1crLZIpkP1YcLh+wPG2sTbvWUdp18sfJRFZVqyj54IrnlwvqWEyCSZxHytUp73b2kepdXCTXSH8jnQkFSnMEA41AjwIkjmjGzgpFm9jSiB7M= 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 1579241521381268.4910606318808; Thu, 16 Jan 2020 22:12:01 -0800 (PST) Received: from localhost ([::1]:52885 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isKrQ-0004He-2v for importer@patchew.org; Fri, 17 Jan 2020 01:12:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49460) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isKpP-0001ze-LX for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isKpM-0005mH-82 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:55 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2681 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isKpL-0005jR-TR for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:09:52 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2281853C5C344C8E3780; Fri, 17 Jan 2020 14:09:48 +0800 (CST) Received: from DESKTOP-9NTIQGG.china.huawei.com (10.173.221.136) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Fri, 17 Jan 2020 14:09:38 +0800 From: To: , Subject: [PATCH v2 2/2] virtio-9p-device: convert to new virtio_delete_queue Date: Fri, 17 Jan 2020 14:09:27 +0800 Message-ID: <20200117060927.51996-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200117060927.51996-1-pannengyuan@huawei.com> References: <20200117060927.51996-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.173.221.136] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: Pan Nengyuan , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan Use virtio_delete_queue to make it more clear. Signed-off-by: Pan Nengyuan Acked-by: Christian Schoenebeck --- Changes V2 to V1: - replace virtio_del_queue to virtio_delete_queue to make it more clear. --- hw/9pfs/virtio-9p-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 910dc5045e..b146387ae2 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -215,7 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev= , Error **errp) V9fsVirtioState *v =3D VIRTIO_9P(dev); V9fsState *s =3D &v->state; =20 - virtio_del_queue(vdev, 0); + virtio_delete_queue(v->vq); virtio_cleanup(vdev); v9fs_device_unrealize_common(s, errp); } --=20 2.21.0.windows.1