Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8922a908 authored by Ulrich Obergfell's avatar Ulrich Obergfell Committed by Christoph Hellwig
Browse files

scsi_error: fix invalid setting of host byte 



After scsi_try_to_abort_cmd returns, the eh_abort_handler may have
already found that the command has completed in the device, causing
the host_byte to be nonzero (e.g. it could be DID_ABORT).  When
this happens, ORing DID_TIME_OUT into the host byte will corrupt
the result field and initiate an unwanted command retry.

Fix this by using set_host_byte instead, following the model of
commit 2082ebc4.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlrich Obergfell <uobergfe@redhat.com>
[Fix all instances according to review comments. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 8b8f5d97

drivers/scsi/scsi_error.c

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ scmd_eh_abort_handler(struct work_struct *work) 
				    "aborting command %p\n", scmd));

		rtn = scsi_try_to_abort_cmd(sdev->host->hostt, scmd);

		if (rtn == SUCCESS) {

			scmd->result |= DID_TIME_OUT << 16;

			set_host_byte(scmd, DID_TIME_OUT);

			if (scsi_host_eh_past_deadline(sdev->host)) {

				SCSI_LOG_ERROR_RECOVERY(3,

					scmd_printk(KERN_INFO, scmd,
@@ -167,7 +167,7 @@ scmd_eh_abort_handler(struct work_struct *work) 
			scmd_printk(KERN_WARNING, scmd,

				    "scmd %p terminate "

				    "aborted command\n", scmd));

		scmd->result |= DID_TIME_OUT << 16;

		set_host_byte(scmd, DID_TIME_OUT);

		scsi_finish_command(scmd);

	}

}
@@ -291,7 +291,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req) 
		if (scsi_abort_command(scmd) == SUCCESS)

			return BLK_EH_NOT_HANDLED;



	scmd->result |= DID_TIME_OUT << 16;

	set_host_byte(scmd, DID_TIME_OUT);



	if (unlikely(rtn == BLK_EH_NOT_HANDLED &&

		     !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)))
@@ -1777,7 +1777,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd) 
		break;

	case DID_ABORT:

		if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {

			scmd->result |= DID_TIME_OUT << 16;

			set_host_byte(scmd, DID_TIME_OUT);

			return SUCCESS;

		}

	case DID_NO_CONNECT: