[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3] s390: avoid potential null dereference ins39
From: |
David Hildenbrand |
Subject: |
Re: [Qemu-devel] [PATCH v3] s390: avoid potential null dereference ins390_pcihost_unplug() |
Date: |
Tue, 8 Jan 2019 16:49:11 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 |
On 08.01.19 16:11, Li Qiang wrote:
> 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>
> ---
>
> Change since v2: use g_assert_not_reached for default branch
>
> 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) {
>
Reviewed-by: David Hildenbrand <address@hidden>
Please note that I'll be sending a bigger unplug rework the next days.
--
Thanks,
David / dhildenb