[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/6] s390x/pci: Ignore the unplug call if we alre
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v2 4/6] s390x/pci: Ignore the unplug call if we already have a release_timer |
Date: |
Mon, 14 Jan 2019 11:31:08 +0100 |
... otherwise two successive calls to qdev_unplug() (e.g. by an impatient
user) will effectively overwrite pbdev->release_timer, resulting in a
memory leak. We are already processing the unplug.
If there is already a release_timer, the unplug will be performed after
the timeout.
Can be easily triggered by
(hmp) device_add virtio-mouse-pci,id=test
(hmp) stop
(hmp) device_del test
(hmp) device_del test
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/s390-pci-bus.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 59325cae3b..34a9cb2a80 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -972,6 +972,9 @@ static void s390_pcihost_unplug(HotplugHandler
*hotplug_dev, DeviceState *dev,
case ZPCI_FS_STANDBY:
break;
default:
+ if (pbdev->release_timer) {
+ return;
+ }
s390_pci_generate_plug_event(HP_EVENT_DECONFIGURE_REQUEST,
pbdev->fh, pbdev->fid);
pbdev->release_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
--
2.17.2
- [Qemu-devel] [PATCH v2 0/6] s390x/pci: hotplug handler fixes and reworks, David Hildenbrand, 2019/01/14
- [Qemu-devel] [PATCH v2 1/6] s390x/pci: Use hotplug_dev instead of looking up the host bridge, David Hildenbrand, 2019/01/14
- [Qemu-devel] [PATCH v2 2/6] s390x/pci: Move some hotplug checks to the pre_plug handler, David Hildenbrand, 2019/01/14
- [Qemu-devel] [PATCH v2 6/6] s390x/pci: Unplug remaining devices on pcihost reset, David Hildenbrand, 2019/01/14
- [Qemu-devel] [PATCH v2 4/6] s390x/pci: Ignore the unplug call if we already have a release_timer,
David Hildenbrand <=
- [Qemu-devel] [PATCH v2 3/6] s390x/pci: Always delete and free the release_timer, David Hildenbrand, 2019/01/14
- [Qemu-devel] [PATCH v2 5/6] s390x/pci: Introduce unplug requests and split unplug handler, David Hildenbrand, 2019/01/14
- Re: [Qemu-devel] [PATCH v2 0/6] s390x/pci: hotplug handler fixes and reworks, Cornelia Huck, 2019/01/16