Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 18bd7718b5c4 ("scsi: ata: libata: Handle completion of CDL commands using policy 0xD")
Reported-by: Borislav Petkov <bp@alien8.de>
Closes: https://lore.kernel.org/linux-ide/20230722155621.GIZLv8JbURKzHtKvQE@fat_crate.local/
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Tested-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>

authored by

Niklas Cassel and committed by
Damien Le Moal
3ac873c7 3fc2febb

+2 -2
+2 -2
drivers/ata/libata-core.c
··· 4938 4938 if (qc->result_tf.status & ATA_SENSE && 4939 4939 ((ata_is_ncq(qc->tf.protocol) && 4940 4940 dev->flags & ATA_DFLAG_CDL_ENABLED) || 4941 - (!(ata_is_ncq(qc->tf.protocol) && 4942 - ata_id_sense_reporting_enabled(dev->id))))) { 4941 + (!ata_is_ncq(qc->tf.protocol) && 4942 + ata_id_sense_reporting_enabled(dev->id)))) { 4943 4943 /* 4944 4944 * Tell SCSI EH to not overwrite scmd->result even if 4945 4945 * this command is finished with result SAM_STAT_GOOD.