Commit 6ca9818d authored May 15, 2023 by Wenchao Hao Committed by Martin K. Petersen May 16, 2023

scsi: Revert "scsi: core: Do not increase scsi_device's iorequest_cnt if dispatch failed"



The "atomic_inc(&cmd->device->iorequest_cnt)" in scsi_queue_rq() would
cause kernel panic because cmd->device may be freed after returning from
scsi_dispatch_cmd().

This reverts commit cfee29ff.

Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
Reported-by: Ming Lei <ming.lei@redhat.com>
Closes: https://lore.kernel.org/r/ZF+zB+bB7iqe0wGd@ovpn-8-17.pek2.redhat.com
Link: https://lore.kernel.org/r/20230515070156.1790181-2-haowenchao2@huawei.com


Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 4e81a6cb

drivers/scsi/scsi_lib.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1463,6 +1463,8 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
		struct Scsi_Host *host = cmd->device->host;
		int rtn = 0;

		atomic_inc(&cmd->device->iorequest_cnt);

		/* check if the device is still usable */
		if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
		/* in SDEV_DEL we error all commands. DID_NO_CONNECT
		@@ -1761,7 +1763,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
		goto out_dec_host_busy;
		}

		atomic_inc(&cmd->device->iorequest_cnt);
		return BLK_STS_OK;

		out_dec_host_busy: