Patch "scsi: return correct blkprep status code in case scsi_init_io() fails." has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

scsi: return correct blkprep status code in case scsi_init_io() fails.

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
scsi-return-correct-blkprep-status-code-in-case-scsi_init_io-fails.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Johannes Thumshirn <[email protected]>
Date: Wed, 12 Apr 2017 09:21:19 +0200
Subject: scsi: return correct blkprep status code in case scsi_init_io() fails.

From: Johannes Thumshirn <[email protected]>

commit e7661a8e5ce10b5321882d0bbaf3f81070903319 upstream.

When instrumenting the SCSI layer to run into the !blk_rq_nr_phys_segments(rq) case the following warning emitted from the block layer:

blk_peek_request: bad return=-22

This happens because since commit fd3fc0b4d730 ("scsi: don't BUG_ON() empty DMA transfers") we return the wrong error value from scsi_prep_fn() back to the block layer.

[mkp: silenced checkpatch]

---
 drivers/scsi/scsi_lib.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -1038,10 +1038,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
 	struct scsi_device *sdev = cmd->device;
 	struct request *rq = cmd->request;
 	bool is_mq = (rq->mq_ctx != NULL);
-	int error;
+	int error = BLKPREP_KILL;
 
 	if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
-		return -EINVAL;
+		goto err_exit;
 
 	error = scsi_init_sgtable(rq, &cmd->sdb);
 	if (error)

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/scsi-return-correct-blkprep-status-code-in-case-scsi_init_io-fails.patch