From 23b4ce3b1ab27196f75bbaa31ef8d00df9eb2597 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Mon, 5 Jun 2017 13:24:43 +0200 Subject: [PATCH 09/13] virtio-serial-bus: Unset hotplug handler when unrealize RH-Author: Ladi Prosek Message-id: <20170605132443.13592-1-lprosek@redhat.com> Patchwork-id: 75481 O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH] virtio-serial-bus: Unset hotplug handler when unrealize Bugzilla: 1458782 RH-Acked-by: Fam Zheng RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Miroslav Rezanina 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini Reviewed-by: Fam Zheng (cherry-picked from commit f811f97040a48358b456b46ecbc9167f0131034f) Signed-off-by: Ladi Prosek Signed-off-by: Miroslav Rezanina --- hw/char/virtio-serial-bus.c | 3 +++ 1 file changed, 3 insertions(+) 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); } -- 1.8.3.1