Skip to content

Commit 816be86

Browse files
ipylypivfloatious
authored andcommitted
ata: libata-scsi: Check ATA_QCFLAG_RTF_FILLED before using result_tf
qc->result_tf contents are only valid when the ATA_QCFLAG_RTF_FILLED flag is set. The ATA_QCFLAG_RTF_FILLED flag should be always set for commands that failed or for commands that have the ATA_QCFLAG_RESULT_TF flag set. Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Niklas Cassel <[email protected]> Signed-off-by: Igor Pylypiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Niklas Cassel <[email protected]>
1 parent 18676c6 commit 816be86

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

drivers/ata/libata-scsi.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,17 @@ void ata_scsi_set_sense_information(struct ata_device *dev,
242242
*/
243243
static void ata_scsi_set_passthru_sense_fields(struct ata_queued_cmd *qc)
244244
{
245+
struct ata_device *dev = qc->dev;
245246
struct scsi_cmnd *cmd = qc->scsicmd;
246247
struct ata_taskfile *tf = &qc->result_tf;
247248
unsigned char *sb = cmd->sense_buffer;
248249

250+
if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) {
251+
ata_dev_dbg(dev,
252+
"missing result TF: can't set ATA PT sense fields\n");
253+
return;
254+
}
255+
249256
if ((sb[0] & 0x7f) >= 0x72) {
250257
unsigned char *desc;
251258
u8 len;
@@ -923,10 +930,17 @@ static void ata_to_sense_error(u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
923930
*/
924931
static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
925932
{
933+
struct ata_device *dev = qc->dev;
926934
struct scsi_cmnd *cmd = qc->scsicmd;
927935
struct ata_taskfile *tf = &qc->result_tf;
928936
u8 sense_key, asc, ascq;
929937

938+
if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) {
939+
ata_dev_dbg(dev,
940+
"missing result TF: can't generate ATA PT sense data\n");
941+
return;
942+
}
943+
930944
/*
931945
* Use ata_to_sense_error() to map status register bits
932946
* onto sense key, asc & ascq.
@@ -967,6 +981,13 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
967981
ata_scsi_set_sense(dev, cmd, NOT_READY, 0x04, 0x21);
968982
return;
969983
}
984+
985+
if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) {
986+
ata_dev_dbg(dev,
987+
"missing result TF: can't generate sense data\n");
988+
return;
989+
}
990+
970991
/* Use ata_to_sense_error() to map status register bits
971992
* onto sense key, asc & ascq.
972993
*/

0 commit comments

Comments
 (0)