Commit 2cbe2de5 authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

virtio-scsi: Unset hotplug handler when unrealize 



This matches the qbus_set_hotplug_handler in realize, and it releases
the final reference to the embedded VirtIODevice so that it is
properly finalized.

A use-after-free is fixed with this patch, indirectly:
virtio_device_instance_finalize wasn't called at hot-unplug, and the
vdev->listener would be a dangling pointer in the global and the per
address space listener list. See also RHBZ 1449031.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170518102808.30046-1-famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 003a0cf2

hw/scsi/virtio-scsi.c

+3 −0
Original line number Diff line number Diff line
@@ -918,6 +918,9 @@ void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp) 


static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp)

{

    VirtIOSCSI *s = VIRTIO_SCSI(dev);



    qbus_set_hotplug_handler(BUS(&s->bus), NULL, &error_abort);

    virtio_scsi_common_unrealize(dev, errp);

}