From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf4lI-0003in-CO for qemu-devel@nongnu.org; Thu, 03 Jan 2019 10:18:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf4lE-0007aV-PO for qemu-devel@nongnu.org; Thu, 03 Jan 2019 10:18:20 -0500 From: Li Qiang Date: Thu, 3 Jan 2019 07:16:12 -0800 Message-Id: <20190103151612.51399-1-liq3ea@163.com> Subject: [Qemu-devel] [PATCH v2] s390: avoid potential null dereference in s390_pcihost_unplug() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: walling@linux.ibm.com, rth@twiddle.net, david@redhat.com, cohuck@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, peter.maydell@linaro.org, Li Qiang When getting the 'pbdev', the if...else has no default branch. >>From Coverity, the 'pbdev' maybe null when the 'dev' is not the TYPE_PCI_BRIDGE/TYPE_PCI_DEVICE/TYPE_S390_PCI_DEVICE. This patch adds a default branch for device plug and unplug. Spotted by Coverity: CID 1398593 Signed-off-by: Li Qiang --- Adds a default branch for device plug per Cornelia's review. hw/s390x/s390-pci-bus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 15759b6514..fe48a36ff6 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -912,6 +912,9 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, pbdev->fh = pbdev->idx; QTAILQ_INSERT_TAIL(&s->zpci_devs, pbdev, link); g_hash_table_insert(s->zpci_table, &pbdev->idx, pbdev); + } else { + error_setg(errp, "s390: device plug request for not supported device" + " type: %s", object_get_typename(OBJECT(dev))); } } @@ -956,6 +959,10 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, } else if (object_dynamic_cast(OBJECT(dev), TYPE_S390_PCI_DEVICE)) { pbdev = S390_PCI_DEVICE(dev); pci_dev = pbdev->pdev; + } else { + error_setg(errp, "s390: device unplug request for not supported device" + " type: %s", object_get_typename(OBJECT(dev))); + return; } switch (pbdev->state) { -- 2.17.1