diff options
| author | Li Qiang <liq3ea@163.com> | 2019-01-08 07:11:14 -0800 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-01-18 11:52:00 +0100 |
| commit | 6ed675c92a80ff83638eef5e12d4aac529c12f93 (patch) | |
| tree | d3ac3de456e33152300a391d6ee467a28f64a83c | |
| parent | 681d61362d3f766a00806b89d6581869041f73cb (diff) | |
| download | qemu-6ed675c92a80ff83638eef5e12d4aac529c12f93.zip qemu-6ed675c92a80ff83638eef5e12d4aac529c12f93.tar.gz qemu-6ed675c92a80ff83638eef5e12d4aac529c12f93.tar.bz2 | |
s390: avoid potential null dereference in s390_pcihost_unplug()
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>
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 15759b6..a94700a 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -912,6 +912,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(); } } @@ -956,6 +958,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) { |