From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebVPr-0001Ym-CK for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:52:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebVPn-00046L-Ip for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:52:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49728) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebVPn-00045x-CN for qemu-devel@nongnu.org; Tue, 16 Jan 2018 12:52:51 -0500 Date: Tue, 16 Jan 2018 19:52:34 +0200 From: "Michael S. Tsirkin" Message-ID: <1516121887-32738-26-git-send-email-mst@redhat.com> References: <1516121887-32738-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1516121887-32738-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 25/34] x86_iommu: check if machine has PCI bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Mohammed Gamal , Peter Xu , Eduardo Habkost , Thomas Huth , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson From: Mohammed Gamal Starting qemu with qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu leads to a segfault. The code assume PCI bus is present and tries to access the bus structure without checking. Since Intel VT-d and AMDVI should only work with PCI, add a check for PCI bus and return error if not present. Reviewed-by: Peter Xu Reviewed-by: Eduardo Habkost Signed-off-by: Mohammed Gamal Reviewed-by: Thomas Huth --- hw/i386/x86-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 51de519..8a01a2d 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)); QLIST_INIT(&x86_iommu->iec_notifiers); - if (!pcms) { + if (!pcms || !pcms->bus) { error_setg(errp, "Machine-type '%s' not supported by IOMMU", mc->name); return; -- MST