aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLadi Prosek <lprosek@redhat.com>2017-05-30 10:59:43 +0200
committerMichael S. Tsirkin <mst@redhat.com>2017-06-02 18:57:16 +0300
commitf811f97040a48358b456b46ecbc9167f0131034f (patch)
treec123b0d74f9531f7a061e6a17dd001f843f15746
parentd47a851caeda96d5979bf48d4bae6a87784ad91d (diff)
downloadqemu-f811f97040a48358b456b46ecbc9167f0131034f.zip
qemu-f811f97040a48358b456b46ecbc9167f0131034f.tar.gz
qemu-f811f97040a48358b456b46ecbc9167f0131034f.tar.bz2
virtio-serial-bus: Unset hotplug handler when unrealize
Virtio serial device controls the lifetime of virtio-serial-bus and virtio-serial-bus links back to the device via its hotplug-handler property. This extra ref-count prevents the device from getting finalized, leaving the VirtIODevice memory listener registered and leading to use-after-free later on. This patch addresses the same issue as Fam Zheng's "virtio-scsi: Unset hotplug handler when unrealize" only for a different virtio device. Cc: qemu-stable@nongnu.org Signed-off-by: Ladi Prosek <lprosek@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com>
-rw-r--r--hw/char/virtio-serial-bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index d797a67..aa9c11a 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -1121,6 +1121,9 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
timer_free(vser->post_load->timer);
g_free(vser->post_load);
}
+
+ qbus_set_hotplug_handler(BUS(&vser->bus), NULL, errp);
+
virtio_cleanup(vdev);
}