libata-scsi: sanitize ata_gen_ata_sense()
authorHannes Reinecke <hare@suse.de>
Mon, 4 Apr 2016 09:43:56 +0000 (11:43 +0200)
committerTejun Heo <tj@kernel.org>
Mon, 4 Apr 2016 16:07:40 +0000 (12:07 -0400)
ata_to_sense_error() is called conditionally, so we should be
generating a default sense if the condition is not met.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/libata-scsi.c

index 6dc2fad..e331077 100644 (file)
@@ -1074,6 +1074,12 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
                ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
                                   &sb[1], &sb[2], &sb[3], verbose);
                sb[1] &= 0x0f;
+       } else {
+               /* Could not decode error */
+               ata_dev_warn(dev, "could not decode error status 0x%x err_mask 0x%x\n",
+                            tf->command, qc->err_mask);
+               ata_scsi_set_sense(cmd, ABORTED_COMMAND, 0, 0);
+               return;
        }
 
        block = ata_tf_read_block(&qc->result_tf, dev);