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

Commit 27db682b authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] scsi_dh_alua: fix stpg sense handling 



For the stpg_endio path we are not evaluating the sense. The bug
is that

1. The error value is set to -EIO when there is sense, so we hit the first
error check and always return SCSI_DH_IO.

2. h->senselen is set to zero in submit_stpg. It is not later set to
req->sense_len like in the synchrounous exection paths, so we must
check the req->sense_len field.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 4f0e359c

drivers/scsi/device_handler/scsi_dh_alua.c

+6 −4
Original line number Diff line number Diff line
@@ -232,13 +232,13 @@ static void stpg_endio(struct request *req, int error) 
	struct scsi_sense_hdr sense_hdr;

	unsigned err = SCSI_DH_OK;



	if (error || host_byte(req->errors) != DID_OK ||

	if (host_byte(req->errors) != DID_OK ||

	    msg_byte(req->errors) != COMMAND_COMPLETE) {

		err = SCSI_DH_IO;

		goto done;

	}



	if (h->senselen > 0) {

	if (req->sense_len > 0) {

		err = scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE,

					   &sense_hdr);

		if (!err) {
@@ -255,7 +255,9 @@ static void stpg_endio(struct request *req, int error) 
			    ALUA_DH_NAME, sense_hdr.sense_key,

			    sense_hdr.asc, sense_hdr.ascq);

		err = SCSI_DH_IO;

	}

	} else if (error)

		err = SCSI_DH_IO;



	if (err == SCSI_DH_OK) {

		h->state = TPGS_STATE_OPTIMIZED;

		sdev_printk(KERN_INFO, h->sdev,