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

Commit a4ecd856 authored by Niklas Cassel's avatar Niklas Cassel Committed by Greg Kroah-Hartman
Browse files

ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES 



commit 3ef600923521616ebe192c893468ad0424de2afb upstream.

For REPORT SUPPORTED OPERATION CODES command, the service action field is
defined as bits 0-4 in the second byte in the CDB. Bits 5-7 in the second
byte are reserved.

Only look at the service action field in the second byte when determining
if the MAINTENANCE IN opcode is a REPORT SUPPORTED OPERATION CODES command.

This matches how we only look at the service action field in the second
byte when determining if the SERVICE ACTION IN(16) opcode is a READ
CAPACITY(16) command (reserved bits 5-7 in the second byte are ignored).

Fixes: 7b203094 ("libata: Add support for SCT Write Same")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec1df5d3

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -4544,7 +4544,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
		break;



	case MAINTENANCE_IN:

		if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES)

		if ((scsicmd[1] & 0x1f) == MI_REPORT_SUPPORTED_OPERATION_CODES)

			ata_scsi_rbuf_fill(&args, ata_scsiop_maint_in);

		else

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