Commit 3ac873c7 authored by Niklas Cassel's avatar Niklas Cassel Committed by Damien Le Moal

ata: libata-core: fix when to fetch sense data for successful commands

The condition to fetch sense data was supposed to be:
ATA_SENSE set AND either
1) Command was NCQ and ATA_DFLAG_CDL_ENABLED flag set (flag
   ATA_DFLAG_CDL_ENABLED will only be set if the Successful NCQ command
   sense data supported bit is set); or
2) Command was non-NCQ and regular sense data reporting is enabled.

However the check in 2) accidentally had the negation at the wrong place,
causing it to try to fetch sense data if it was a non-NCQ command _or_
if regular sense data reporting was _not_ enabled.

Fix this by removing the extra parentheses that should not be there,
such that only the correct return (ata_is_ncq()) is negated.

Fixes: 18bd7718 ("scsi: ata: libata: Handle completion of CDL commands using policy 0xD")
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Closes: https://lore.kernel.org/linux-ide/20230722155621.GIZLv8JbURKzHtKvQE@fat_crate.local/Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Tested-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent 3fc2febb
...@@ -4938,8 +4938,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc) ...@@ -4938,8 +4938,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
if (qc->result_tf.status & ATA_SENSE && if (qc->result_tf.status & ATA_SENSE &&
((ata_is_ncq(qc->tf.protocol) && ((ata_is_ncq(qc->tf.protocol) &&
dev->flags & ATA_DFLAG_CDL_ENABLED) || dev->flags & ATA_DFLAG_CDL_ENABLED) ||
(!(ata_is_ncq(qc->tf.protocol) && (!ata_is_ncq(qc->tf.protocol) &&
ata_id_sense_reporting_enabled(dev->id))))) { ata_id_sense_reporting_enabled(dev->id)))) {
/* /*
* Tell SCSI EH to not overwrite scmd->result even if * Tell SCSI EH to not overwrite scmd->result even if
* this command is finished with result SAM_STAT_GOOD. * this command is finished with result SAM_STAT_GOOD.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment