OSDN Git Service

scsi: virtio_scsi: don't send sc payload with tmfs
authorFelipe Franciosi <felipe@nutanix.com>
Wed, 27 Feb 2019 16:10:34 +0000 (16:10 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 6 Mar 2019 17:35:02 +0000 (12:35 -0500)
commit3722e6a52174d7c3a00e6f5efd006ca093f346c1
tree1e03745bc153c08498824b1794799085290554ae
parent441b7195e2812f2d7a9dafe02f052f642957bd8f
scsi: virtio_scsi: don't send sc payload with tmfs

The virtio scsi spec defines struct virtio_scsi_ctrl_tmf as a set of
device-readable records and a single device-writable response entry:

    struct virtio_scsi_ctrl_tmf
    {
        // Device-readable part
        le32 type;
        le32 subtype;
        u8 lun[8];
        le64 id;
        // Device-writable part
        u8 response;
    }

The above should be organised as two descriptor entries (or potentially
more if using VIRTIO_F_ANY_LAYOUT), but without any extra data after "le64
id" or after "u8 response".

The Linux driver doesn't respect that, with virtscsi_abort() and
virtscsi_device_reset() setting cmd->sc before calling virtscsi_tmf().  It
results in the original scsi command payload (or writable buffers) added to
the tmf.

This fixes the problem by leaving cmd->sc zeroed out, which makes
virtscsi_kick_cmd() add the tmf to the control vq without any payload.

Cc: stable@vger.kernel.org
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/virtio_scsi.c