ata: Fix ZBC_OUT all bit handling

If the ALL bit is set in the ZBC_OUT command, the command zone ID field
(block) should be ignored.

Reported-by: David Butterfield <david.butterfield@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Damien Le Moal 2018-06-26 20:56:55 +09:00 committed by Tejun Heo
parent b320a0a9f2
commit 6edf1d4cb0
1 changed files with 8 additions and 3 deletions

View File

@ -3805,7 +3805,14 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
*/ */
goto invalid_param_len; goto invalid_param_len;
} }
if (block >= dev->n_sectors) {
all = cdb[14] & 0x1;
if (all) {
/*
* Ignore the block address (zone ID) as defined by ZBC.
*/
block = 0;
} else if (block >= dev->n_sectors) {
/* /*
* Block must be a valid zone ID (a zone start LBA). * Block must be a valid zone ID (a zone start LBA).
*/ */
@ -3813,8 +3820,6 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
goto invalid_fld; goto invalid_fld;
} }
all = cdb[14] & 0x1;
if (ata_ncq_enabled(qc->dev) && if (ata_ncq_enabled(qc->dev) &&
ata_fpdma_zac_mgmt_out_supported(qc->dev)) { ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
tf->protocol = ATA_PROT_NCQ_NODATA; tf->protocol = ATA_PROT_NCQ_NODATA;