[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] s390: avoid potential null dereference in s390
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 01/11] s390: avoid potential null dereference in s390_pcihost_unplug() |
Date: |
Fri, 18 Jan 2019 13:19:15 +0100 |
From: Li Qiang <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Reviewed-by: Collin Walling <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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 15759b6514..a94700a78c 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) {
--
2.17.2
- [Qemu-devel] [PULL 00/11] s390x updates, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 01/11] s390: avoid potential null dereference in s390_pcihost_unplug(),
Cornelia Huck <=
- [Qemu-devel] [PULL 04/11] configure: Only build the s390-ccw bios if the compiler supports -march=z900, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 03/11] s390x: Return specification exception for unimplemented diag 308 subcodes, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 02/11] pc-bios/s390-ccw: Use proper register names for Clang, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 05/11] s390x/pci: Send correct event on hotplug, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 06/11] s390x/pci: Set the iommu region size mpcifc request, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 07/11] s390x/pci: Use hotplug_dev instead of looking up the host bridge, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 08/11] s390x/pci: Move some hotplug checks to the pre_plug handler, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 09/11] s390x/pci: Always delete and free the release_timer, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 11/11] s390x/pci: add common function measurement block, Cornelia Huck, 2019/01/18
- [Qemu-devel] [PULL 10/11] s390x/pci: Ignore the unplug call if we already have a release_timer, Cornelia Huck, 2019/01/18