Commit 475fc97d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

amd_iommu: Fix amdvi_realize() error API violation 



The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.

amdvi_realize() is wrong that way: it passes @errp to qdev_realize(),
object_property_get_int(), and msi_init() without checking it.  I
can't tell offhand whether qdev_realize() can fail here.  Fix by
checking it for failure.  object_property_get_int() can't.  Fix by
passing &error_abort instead.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200630090351.1247703-22-armbru@redhat.com>
parent 18d588fe

hw/i386/amd_iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -1549,7 +1549,9 @@ static void amdvi_realize(DeviceState *dev, Error **errp) 


    /* This device should take care of IOMMU PCI properties */

    x86_iommu->type = TYPE_AMD;

    qdev_realize(DEVICE(&s->pci), &bus->qbus, errp);

    if (!qdev_realize(DEVICE(&s->pci), &bus->qbus, errp)) {

        return;

    }

    ret = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0,

                                         AMDVI_CAPAB_SIZE, errp);

    if (ret < 0) {
@@ -1578,7 +1580,7 @@ static void amdvi_realize(DeviceState *dev, Error **errp) 
    sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mmio);

    sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, AMDVI_BASE_ADDR);

    pci_setup_iommu(bus, amdvi_host_dma_iommu, s);

    s->devid = object_property_get_int(OBJECT(&s->pci), "addr", errp);

    s->devid = object_property_get_int(OBJECT(&s->pci), "addr", &error_abort);

    msi_init(&s->pci.dev, 0, 1, true, false, errp);

    amdvi_init(s);

}