Commit 8f001769 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: Fix sshdr use in scsi_cdl_enable 



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: default avatarMike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20231004210013.5601-11-michael.christie@oracle.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarMartin Wilck <mwilck@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f43158ee

drivers/scsi/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;