Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdda0e5a authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Christoph Hellwig
Browse files

virtio-scsi: avoid cancelling uninitialized work items 



Calling the workqueue interface on uninitialized work items isn't a
good idea even if they're zeroed. It's not failing catastrophically only
through happy accidents.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7114aae0

drivers/scsi/virtio_scsi.c

+3 −1
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ static void virtscsi_ctrl_done(struct virtqueue *vq) 
	virtscsi_vq_done(vscsi, &vscsi->ctrl_vq, virtscsi_complete_free);

};



static void virtscsi_handle_event(struct work_struct *work);



static int virtscsi_kick_event(struct virtio_scsi *vscsi,

			       struct virtio_scsi_event_node *event_node)

{
@@ -260,6 +262,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi, 
	struct scatterlist sg;

	unsigned long flags;



	INIT_WORK(&event_node->work, virtscsi_handle_event);

	sg_init_one(&sg, &event_node->event, sizeof(struct virtio_scsi_event));



	spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags);
@@ -377,7 +380,6 @@ static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf) 
{

	struct virtio_scsi_event_node *event_node = buf;



	INIT_WORK(&event_node->work, virtscsi_handle_event);

	schedule_work(&event_node->work);

}