From: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Date: Fri, 16 Jan 2015 13:55:21 +0000 (+0100)
Subject: s390x/pci: check for invalid function handle
X-Git-Tag: pull-nvme-20200902~4322^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b324bbafc4fe367bd9c5bfa6cff071081fb8b0e;p=qemu-nvme.git

s390x/pci: check for invalid function handle

broken guest may provide 0 (invalid) function handle to zpci
instructions. Since we use function handle 0 to indicate an empty
slot in the PHB we have to add an additional check to spot this
kind of error.

Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index d25ac74f9c..dc455a2bb7 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -170,7 +170,7 @@ S390PCIBusDevice *s390_pci_find_dev_by_fh(uint32_t fh)
     S390pciState *s = S390_PCI_HOST_BRIDGE(
         object_resolve_path(TYPE_S390_PCI_HOST_BRIDGE, NULL));
 
-    if (!s) {
+    if (!s || !fh) {
         return NULL;
     }