Commit be9f642e authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Zheng Zengkai
Browse files

scsi: core: Stop using DRIVER_ERROR 

mainline inclusion
from mainline-5.14-rc1
commit ced202f7
category: bugfix
bugzilla: 185813 https://gitee.com/openeuler/kernel/issues/I4DDEL
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ced202f7bd78eb6a79c441a8b217e0f3d38bccfc

---------------------------

Return the actual error code in __scsi_execute() (which, according to the
documentation, should have happened anyway).  And audit all callers to cope
with negative return values from __scsi_execute() and friends.

[mkp: resolve conflict and return bool]

Link: https://lore.kernel.org/r/20210427083046.31620-7-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent bde686c0

drivers/ata/libata-scsi.c

+8 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,

				  sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (cmd_result < 0) {

		rc = cmd_result;

		goto error;

	}

	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;

		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
@@ -490,6 +494,10 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,

				sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (cmd_result < 0) {

		rc = cmd_result;

		goto error;

	}

	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;

		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */

drivers/scsi/ch.c

+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len, 
	result = scsi_execute_req(ch->device, cmd, direction, buffer,

				  buflength, &sshdr, timeout * HZ,

				  MAX_RETRIES, NULL);



	if (result < 0)

		return result;

	if (driver_byte(result) == DRIVER_SENSE) {

		if (debug)

			scsi_print_sense_hdr(ch->device, ch->name, &sshdr);

drivers/scsi/cxlflash/superpipe.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli) 
		goto out;

	}



	if (driver_byte(result) == DRIVER_SENSE) {

	if (result > 0 && driver_byte(result) == DRIVER_SENSE) {

		result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */

		if (result & SAM_STAT_CHECK_CONDITION) {

			switch (sshdr.sense_key) {

drivers/scsi/scsi.c

+2 −0
Original line number Diff line number Diff line
@@ -495,6 +495,8 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer, 
	result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len,

				  &sshdr, 30 * HZ, 3, NULL);



	if (result < 0)

		return result;

	if (result && scsi_sense_valid(&sshdr) &&

	    sshdr.sense_key == ILLEGAL_REQUEST &&

	    (sshdr.asc == 0x20 || sshdr.asc == 0x24) && sshdr.ascq == 0x00)

drivers/scsi/scsi_ioctl.c

+3 −1
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, 
	SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev,

				      "Ioctl returned  0x%x\n", result));



	if (result < 0)

		goto out;

	if (driver_byte(result) == DRIVER_SENSE &&

	    scsi_sense_valid(&sshdr)) {

		switch (sshdr.sense_key) {
@@ -133,7 +135,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, 
			break;

		}

	}



out:

	SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev,

				      "IOCTL Releasing command\n"));

	return result;