From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C7D9C2D0DB for ; Mon, 20 Jan 2020 13:26:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 20AF221835 for ; Mon, 20 Jan 2020 13:26:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20AF221835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itX4O-0000H0-97 for qemu-devel@archiver.kernel.org; Mon, 20 Jan 2020 08:26:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32872) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itX3D-0007cJ-1T for qemu-devel@nongnu.org; Mon, 20 Jan 2020 08:25:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itX38-0007KC-3R for qemu-devel@nongnu.org; Mon, 20 Jan 2020 08:25:06 -0500 Received: from 5.mo177.mail-out.ovh.net ([46.105.39.154]:48218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itX37-0007IH-3t for qemu-devel@nongnu.org; Mon, 20 Jan 2020 08:25:01 -0500 Received: from player159.ha.ovh.net (unknown [10.109.146.211]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id 0026D11CF67 for ; Mon, 20 Jan 2020 14:24:55 +0100 (CET) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player159.ha.ovh.net (Postfix) with ESMTPSA id ECBBDE64CDB1; Mon, 20 Jan 2020 13:24:47 +0000 (UTC) Date: Mon, 20 Jan 2020 14:24:45 +0100 From: Greg Kurz To: "Michael S. Tsirkin" Subject: Re: [PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize Message-ID: <20200120142445.534bfe7a@bahia.lan> In-Reply-To: <20200117084322-mutt-send-email-mst@kernel.org> References: <20200117060927.51996-1-pannengyuan@huawei.com> <20200117060927.51996-2-pannengyuan@huawei.com> <7781044.dIsAdKOGtE@silver> <20200117084322-mutt-send-email-mst@kernel.org> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 12260768511563897305 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrudehgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkjghfofggtgfgsehtjeertdertddvnecuhfhrohhmpefirhgvghcumfhurhiiuceoghhrohhugheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpkedvrddvheefrddvtdekrddvgeeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrudehledrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhg X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.39.154 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: pannengyuan@huawei.com, zhang.zhanghailiang@huawei.com, Christian Schoenebeck , qemu-devel@nongnu.org, Euler Robot Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 17 Jan 2020 08:43:42 -0500 "Michael S. Tsirkin" wrote: > On Fri, Jan 17, 2020 at 01:52:53PM +0100, Christian Schoenebeck wrote: > > On Freitag, 17. Januar 2020 07:09:26 CET pannengyuan@huawei.com wrote: > > > 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/sdb/qemu/hw/virtio/virtio.c:2327 #3 0x55a3a571bac7 > > > (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7) > > > /mnt/sdb/qemu/hw/9pfs/virtio-9p-device.c:209 #4 0x55a3a58e7bc6 > > > (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6) > > > /mnt/sdb/qemu/hw/virtio/virtio.c:3504 #5 0x55a3a5ebfb37 > > > (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37) > > > /mnt/sdb/qemu/hw/core/qdev.c:876 > > > > > > Reported-by: Euler Robot > > > Signed-off-by: Pan Nengyuan > > > > Reviewed-by: Christian Schoenebeck > > > > Maybe you could add this patch to your revised PR Greg? > > I'm testing all the related virtio changes and they will be > in my next PR. > Thanks Michael. You can add this tag for the whole series: Acked-by: Greg Kurz > > > --- > > > 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 = VIRTIO_9P(dev); > > > V9fsState *s = &v->state; > > > > > > + virtio_del_queue(vdev, 0); > > > virtio_cleanup(vdev); > > > v9fs_device_unrealize_common(s, errp); > > > } > > > > > > >