commit 0d36d791927753599e9ca36e344f9fb272126e3d
author Yi Min Zhao <zyimin@linux.vnet.ibm.com> Wed Aug 10 16:10:08 2016 +0800
committer Cornelia Huck <cornelia.huck@de.ibm.com> Mon Sep 05 15:15:16 2016 +0200
tree db1a36f7faa0c4d3166a2a366671d6d0cf542c70
parent 61823988df67eba82d59bd9d2cfd643aeac92826

s390x/pci: return directly if create zpci failed

In the case that zpci is automatically created, we did not return
immediately on failure, which would lead to NULL pointer dereferencing.
Let's fix it.

Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

hw/s390x/s390-pci-bus.c

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 9c1c04e..5750f22 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -649,6 +649,7 @@
             pbdev = s390_pci_device_new(dev->id);
             if (!pbdev) {
                 error_setg(errp, "create zpci device failed");
+                return;
             }
         }