diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-02-01 16:37:00 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2021-03-02 09:16:18 -0500 |
| commit | b52fa0ea45bea494a953dd766151d584a28e87e5 (patch) | |
| tree | d71d632dc72a62e8bea172c78dac0bfe23b278de | |
| parent | fb592882397870a9eaf206f6c92789274ed07dda (diff) | |
| download | qemu-b52fa0ea45bea494a953dd766151d584a28e87e5.zip | |
hw/pci: Have safer pcie_bus_realize() by checking error path
While pci_bus_realize() currently does not use the Error* argument,
it would be an error to leave pcie_bus_realize() setting bus->flags
if pci_bus_realize() had failed.
Fix by using a local Error* and return early (propagating the error)
if pci_bus_realize() failed.
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210201153700.618946-1-philmd@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci/pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index fa97a671d1..0eadcdbc9e 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -132,8 +132,13 @@ static void pci_bus_realize(BusState *qbus, Error **errp) static void pcie_bus_realize(BusState *qbus, Error **errp) { PCIBus *bus = PCI_BUS(qbus); + Error *local_err = NULL; - pci_bus_realize(qbus, errp); + pci_bus_realize(qbus, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } /* * A PCI-E bus can support extended config space if it's the root |