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

Commit a0a28644 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fix from James Bottomley:
 "A single fix this time: a fix for a virtqueue removal bug which only
  appears to affect S390, but which results in the queue hanging forever
  thus causing the machine to fail shutdown"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: virtio_scsi: Reject commands when virtqueue is broken
parents a49e6f58 6f3e71c0

drivers/scsi/virtio_scsi.c

+10 −1
Original line number Diff line number Diff line
@@ -534,7 +534,9 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, 
{

	struct Scsi_Host *shost = virtio_scsi_host(vscsi->vdev);

	struct virtio_scsi_cmd *cmd = scsi_cmd_priv(sc);

	unsigned long flags;

	int req_size;

	int ret;



	BUG_ON(scsi_sg_count(sc) > shost->sg_tablesize);
@@ -562,8 +564,15 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, 
		req_size = sizeof(cmd->req.cmd);

	}



	if (virtscsi_kick_cmd(req_vq, cmd, req_size, sizeof(cmd->resp.cmd)) != 0)

	ret = virtscsi_kick_cmd(req_vq, cmd, req_size, sizeof(cmd->resp.cmd));

	if (ret == -EIO) {

		cmd->resp.cmd.response = VIRTIO_SCSI_S_BAD_TARGET;

		spin_lock_irqsave(&req_vq->vq_lock, flags);

		virtscsi_complete_cmd(vscsi, cmd);

		spin_unlock_irqrestore(&req_vq->vq_lock, flags);

	} else if (ret != 0) {

		return SCSI_MLQUEUE_HOST_BUSY;

	}

	return 0;

}