From patchwork Mon Sep 21 11:30:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11789453 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1AFD6CA for ; Mon, 21 Sep 2020 11:32:57 +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 7DCAE20874 for ; Mon, 21 Sep 2020 11:32:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Epr7RMMV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DCAE20874 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKK40-0005of-GP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Sep 2020 07:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKK1Z-0003SL-EZ for qemu-devel@nongnu.org; Mon, 21 Sep 2020 07:30:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKK1X-0000nh-Ej for qemu-devel@nongnu.org; Mon, 21 Sep 2020 07:30:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600687822; 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: in-reply-to:in-reply-to:references:references; bh=IiK5qvCobeUOC+twrCHu2MpA9Z7XZegxxrbNBvwmzOg=; b=Epr7RMMVyqBDDbUd++eETvCk6xORNFNmVOAZJRyz92oJ9k8XI1zgsQPV82rsYjzngaF0uf CCpj2ZgzRwR3ofi3+dcE6C5hdjT9hPwy673SEQF3fFjvy/uXT3m/IaSH2vinFJgj3Mi6nq ZTLMBdIMKXeY37hBqVdpHD1+WJlnoAE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-dj7agwWGPEue77u2wJ89pw-1; Mon, 21 Sep 2020 07:30:19 -0400 X-MC-Unique: dj7agwWGPEue77u2wJ89pw-1 Received: by mail-wr1-f71.google.com with SMTP id v12so5741474wrm.9 for ; Mon, 21 Sep 2020 04:30:19 -0700 (PDT) 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:in-reply-to; bh=IiK5qvCobeUOC+twrCHu2MpA9Z7XZegxxrbNBvwmzOg=; b=LdjDa3z/DV4DpaNaLNlQm3dja/Be5tzzv8yn3/2ZS0UNaGdpsLmxwdJ6ZiE3zI2O2D JepIJTwoRdtT1XjuojyIEj2cTf2cvfehl1muHl20AdZlWmo13BtBUUKgScdXuzoF2wKc GOmUGVS7lvKWZ3Id5BKhPB0+6j3CLc4TeeaTJvHGQy3huZUYhwqn1C0CLQfDar/lHaaT nJYcC8GOpHRlFmmR8M784da0PqZ/qyDQhBUdIU0R0olnGH18oTU16Fks405ZB2TZ9acP HxsD5xQ0WVAHz0csdOeeSFdhPfBaklMugUJiGk5JQaSDypUxJIzfF6ot0ZLozl4g5BBY Vw4A== X-Gm-Message-State: AOAM532YsmibinlwtUsHNRgKk4xsnD/Cyr2TB/b4/MyJQ6MevAurAxKk ZgxMZfPqHpRq5EeMCLbrQrxNyrEwEPxscGswFIwMXwqSF2VYf0v3zDzxL1wVw49IKTRRg0/nn8K h4RREig/SnMHPfQE= X-Received: by 2002:a05:600c:2047:: with SMTP id p7mr31950193wmg.168.1600687818307; Mon, 21 Sep 2020 04:30:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyu9HZSkLxW1FxZ6YEDr2eUXbgKaiUjkpLdEl4u9qO9mSYEe0suFAgdxEaHaMfiidkBuaAXQ== X-Received: by 2002:a05:600c:2047:: with SMTP id p7mr31950181wmg.168.1600687818092; Mon, 21 Sep 2020 04:30:18 -0700 (PDT) Received: from redhat.com (bzq-109-65-116-225.red.bezeqint.net. [109.65.116.225]) by smtp.gmail.com with ESMTPSA id b84sm20931540wmd.0.2020.09.21.04.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 04:30:17 -0700 (PDT) Date: Mon, 21 Sep 2020 07:30:15 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v3 14/15] virtio-iommu: Check gtrees are non null before destroying them Message-ID: <20200921112913.555392-15-mst@redhat.com> References: <20200921112913.555392-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200921112913.555392-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/21 01:44:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Cornelia Huck , qemu-stable@nongnu.org, Eric Auger Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger If realize fails, domains and endpoints trees may be NULL. On unrealize(), this produces assertions: "GLib: g_tree_destroy: assertion 'tree != NULL' failed" Check that the trees are non NULL before destroying them. Cc: qemu-stable@nongnu.org Signed-off-by: Eric Auger Reviewed-by: Cornelia Huck Message-Id: <20200908193309.20569-2-eric.auger@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 5d56865e56..21ec63b108 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -801,8 +801,12 @@ static void virtio_iommu_device_unrealize(DeviceState *dev) VirtIOIOMMU *s = VIRTIO_IOMMU(dev); g_hash_table_destroy(s->as_by_busptr); - g_tree_destroy(s->domains); - g_tree_destroy(s->endpoints); + if (s->domains) { + g_tree_destroy(s->domains); + } + if (s->endpoints) { + g_tree_destroy(s->endpoints); + } virtio_delete_queue(s->req_vq); virtio_delete_queue(s->event_vq);