Commit e6d7eba2 authored by Damien Le Moal's avatar Damien Le Moal Committed by Niklas Cassel
Browse files

ata: libata-scsi: report correct sense field pointer in ata_scsiop_maint_in() 



Commit 4ab7bb97 ("ata: libata-scsi: Refactor ata_scsiop_maint_in()")
modified ata_scsiop_maint_in() to directly call
ata_scsi_set_invalid_field() to set the field pointer of the sense data
of a failed MAINTENANCE IN command. However, in the case of an invalid
command format, the sense data field incorrectly indicates byte 1 of
the CDB. Fix this to indicate byte 2 of the command.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Fixes: 4ab7bb97 ("ata: libata-scsi: Refactor ata_scsiop_maint_in()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent ce5ae93d

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3600,7 +3600,7 @@ static unsigned int ata_scsiop_maint_in(struct ata_device *dev, 


	if (cdb[2] != 1 && cdb[2] != 3) {

		ata_dev_warn(dev, "invalid command format %d\n", cdb[2]);

		ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

		ata_scsi_set_invalid_field(dev, cmd, 2, 0xff);

		return 0;

	}