From patchwork Tue Jan 7 07:35:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 1218711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="WdAa70i7"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47sS8B1gFyz9sRG for ; Tue, 7 Jan 2020 20:42:02 +1100 (AEDT) Received: from localhost ([::1]:45374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iolJs-0005sB-RZ for incoming@patchwork.ozlabs.org; Tue, 07 Jan 2020 04:38:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iojOr-0004QZ-HA for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iojOp-0007Oi-Vg for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:35:37 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39203 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iojOp-0007OS-RM for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:35:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578382535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nm5rBDcoCplmlWRAfpJUTX03Lt2BWA14BTGdBKMUPBs=; b=WdAa70i7xLvjO1zsyMCX01K+L5r9iMvG1U9omGZw72T6VM15F7Pd3MSmqCL9O/p+D6UnmT xNM1zIx+PhtskRnvjsCECKuvZmxNHg5X7mh3jAM5u6JZpZq9ifXCCp62kKkXiNkuefY0n3 SGkKuoCNLAZuia5YlJ71UbSLJ4pFBiA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-JPcXG3FtMx-4m4293IqxJg-1; Tue, 07 Jan 2020 02:35:33 -0500 Received: by mail-qk1-f199.google.com with SMTP id 24so19533221qka.16 for ; Mon, 06 Jan 2020 23:35:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=SV/3gkt55AkXiObd4ttRVZfM0Ouiap0tkA8DR2mthfg=; b=WtSRqdd7DZBhOSHKzDgyorKu/BpliDt/hnI05oAMUPzoQNDtSIKNFfD8Nhvx6W6qOZ TPDLngbGRkOJS/IXGPKpMGzhcW5oZFoo7o5zXdQ8ehKFDe632Hqh3nivfbnBw23EYeDv cGpbyBga8D/yJhWBRUJCUE8VIX6fsLFGL2iQkZUCxsPk+jJYqsARZV+Wc1/6BYDbcZMa f6xuff0MzrB21imPFxzbAHRneeBJGF0HCZudwaw6oV8eabNUF15k/rpjEJxHzsSv5Y+e 0UOmWeqDcmqbsQARuWbQqiI5eutZee8FUPxlmcgwRdoxyhfh7wg/eDHw00g1NZ6Vzko/ aO8A== X-Gm-Message-State: APjAAAVFLh06rUybIED1TkHM5lXRvXN+TZ3Yc7JWoklrc2IZyH7lIcYV G4WlAeY0NOtHzMRFUxTZh5ROAqcBiS18dqe7ji8kW0aZl3rjWD1pxVsuJSWlukpdt+8tEleMsXo qF56/qs6qbcWyNOc= X-Received: by 2002:ac8:4a10:: with SMTP id x16mr77211027qtq.371.1578382533045; Mon, 06 Jan 2020 23:35:33 -0800 (PST) X-Google-Smtp-Source: APXvYqxXXUsgb1tFKZVVnJc4c9Dx8hlj36CENQ7Ymj6ynLjzWachi2rZOjgDXNXX9O4yyRojY2LejA== X-Received: by 2002:ac8:4a10:: with SMTP id x16mr77211011qtq.371.1578382532880; Mon, 06 Jan 2020 23:35:32 -0800 (PST) Received: from redhat.com (bzq-79-183-34-164.red.bezeqint.net. [79.183.34.164]) by smtp.gmail.com with ESMTPSA id d5sm21367620qtk.96.2020.01.06.23.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 23:35:32 -0800 (PST) Date: Tue, 7 Jan 2020 02:35:27 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 04/32] virtio-serial-bus: fix memory leak while attach virtio-serial-bus Message-ID: <20200107073451.298261-5-mst@redhat.com> References: <20200107073451.298261-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200107073451.298261-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: JPcXG3FtMx-4m4293IqxJg-1 X-Mimecast-Spam-Score: 0 Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Laurent Vivier , Peter Maydell , Amit Shah , Pan Nengyuan , Paolo Bonzini , Euler Robot , =?utf-8?q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Pan Nengyuan ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in virtio_serial_device_unrealize, the memory leak stack is as bellow: Direct leak of 1290240 byte(s) in 180 object(s) allocated from: #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560) #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015) #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327 #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089 #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504 #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876 #6 0x5650e0531efd in property_set_bool qom/object.c:2080 #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26 #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338 #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Cc: Laurent Vivier Cc: Amit Shah Cc: "Marc-André Lureau" Cc: Paolo Bonzini Message-Id: <1575444716-17632-3-git-send-email-pannengyuan@huawei.com> Signed-off-by: Michael S. Tsirkin Reviewed-by: Michael S. Tsirkin --- hw/char/virtio-serial-bus.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 33259042a9..e1cbce3ba3 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSerial *vser = VIRTIO_SERIAL(dev); + int i; QLIST_REMOVE(vser, next); + virtio_delete_queue(vser->c_ivq); + virtio_delete_queue(vser->c_ovq); + for (i = 0; i < vser->bus.max_nr_ports; i++) { + virtio_delete_queue(vser->ivqs[i]); + virtio_delete_queue(vser->ovqs[i]); + } + g_free(vser->ivqs); g_free(vser->ovqs); g_free(vser->ports_map);