[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path |
Date: |
Mon, 1 Feb 2021 16:37:00 +0100 |
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>
---
hw/pci/pci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 512e9042ffa..0d12e94a02e 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -130,8 +130,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
--
2.26.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path,
Philippe Mathieu-Daudé <=