From fae9b269df8dc92176dad05824d8f8e911fb8269 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:26 +0100

Subject: [PATCH 09/24] s390: avoid potential null dereference in

 s390_pcihost_unplug()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-10-cohuck@redhat.com>

Patchwork-id: 85790

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 09/24] s390: avoid potential null dereference in s390_pcihost_unplug()

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: Li Qiang <liq3ea@163.com>

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 <liq3ea@163.com>

Message-Id: <20190108151114.33140-1-liq3ea@163.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Halil Pasic <pasic@linux.ibm.com>

Reviewed-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 6ed675c92a80ff83638eef5e12d4aac529c12f93)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/s390-pci-bus.c | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c

index 9c444b6..486c4b6 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -916,6 +916,8 @@ 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 {

+        g_assert_not_reached();

     }

 }

@@ -960,6 +962,8 @@ 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 {

+        g_assert_not_reached();

     }

     switch (pbdev->state) {

-- 

1.8.3.1