scsi: Fix sshdr use in scsi_cdl_enable
authorMike Christie <michael.christie@oracle.com>
Wed, 4 Oct 2023 21:00:11 +0000 (16:00 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 13 Oct 2023 20:36:20 +0000 (16:36 -0400)
If scsi_execute_cmd returns < 0, it doesn't initialize the sshdr, so we
shouldn't access the sshdr. If it returns 0, then the cmd executed
successfully, so there is no need to check the sshdr. This has us access
the sshdr when we get a return value > 0.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20231004210013.5601-11-michael.christie@oracle.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi.c

index d0911bc28663a8142d0fb0ae69dbad1348efa385..d1c0ba3ef1f5131edaf66d0e124bb784dc8cab9c 100644 (file)
@@ -692,7 +692,7 @@ int scsi_cdl_enable(struct scsi_device *sdev, bool enable)
                ret = scsi_mode_select(sdev, 1, 0, buf_data, len, 5 * HZ, 3,
                                       &data, &sshdr);
                if (ret) {
-                       if (scsi_sense_valid(&sshdr))
+                       if (ret > 0 && scsi_sense_valid(&sshdr))
                                scsi_print_sense_hdr(sdev,
                                        dev_name(&sdev->sdev_gendev), &sshdr);
                        return ret;