* [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path
@ 2021-02-01 15:37 Philippe Mathieu-Daudé
2021-03-01 8:19 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-01 15:37 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Markus Armbruster,
Michael S. Tsirkin
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path
2021-02-01 15:37 [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path Philippe Mathieu-Daudé
@ 2021-03-01 8:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-01 8:19 UTC (permalink / raw)
To: qemu-devel, Michael S. Tsirkin; +Cc: Markus Armbruster
ping?
On 2/1/21 4:37 PM, Philippe Mathieu-Daudé wrote:
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-01 8:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-01 15:37 [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path Philippe Mathieu-Daudé
2021-03-01 8:19 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).