virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
unregistered. We will have a use-after-free usage when the notifier
callback is called after virtscsi_freeze.
Fixes: 285e71ea6f
("virtio-scsi: reset virtqueue affinity when doing cpu hotplug")
Cc: stable@vger.kernel.org
Signed-off-by: Asias He <asias.hejun@gmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
parent
7d2dddda5c
commit
f466f75385
|
@ -956,6 +956,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
|
|||
#ifdef CONFIG_PM_SLEEP
|
||||
static int virtscsi_freeze(struct virtio_device *vdev)
|
||||
{
|
||||
struct Scsi_Host *sh = virtio_scsi_host(vdev);
|
||||
struct virtio_scsi *vscsi = shost_priv(sh);
|
||||
|
||||
unregister_hotcpu_notifier(&vscsi->nb);
|
||||
virtscsi_remove_vqs(vdev);
|
||||
return 0;
|
||||
}
|
||||
|
@ -964,8 +968,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
|
|||
{
|
||||
struct Scsi_Host *sh = virtio_scsi_host(vdev);
|
||||
struct virtio_scsi *vscsi = shost_priv(sh);
|
||||
int err;
|
||||
|
||||
return virtscsi_init(vdev, vscsi);
|
||||
err = virtscsi_init(vdev, vscsi);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = register_hotcpu_notifier(&vscsi->nb);
|
||||
if (err)
|
||||
vdev->config->del_vqs(vdev);
|
||||
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue