[SCSI] lpfc 8.1.7: Fix panic in lpfc_sli_validate_fcp_iocb (420b630d) · Commits · 戴 / test

drivers/scsi/lpfc/lpfc_scsi.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -616,6 +616,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
		static int
		lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
		struct lpfc_scsi_buf *lpfc_cmd,
		unsigned int lun,
		uint8_t task_mgmt_cmd)
		{
		struct lpfc_sli *psli;
		@@ -634,8 +635,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
		piocb = &piocbq->iocb;

		fcp_cmnd = lpfc_cmd->fcp_cmnd;
		int_to_scsilun(lpfc_cmd->pCmd->device->lun,
		&lpfc_cmd->fcp_cmnd->fcp_lun);
		int_to_scsilun(lun, &lpfc_cmd->fcp_cmnd->fcp_lun);
		fcp_cmnd->fcpCntl2 = task_mgmt_cmd;

		piocb->ulpCommand = CMD_FCP_ICMND64_CR;
		@@ -662,14 +662,16 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,

		static int
		lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba,
		unsigned tgt_id, struct lpfc_rport_data *rdata)
		unsigned tgt_id, unsigned int lun,
		struct lpfc_rport_data *rdata)
		{
		struct lpfc_iocbq *iocbq;
		struct lpfc_iocbq *iocbqrsp;
		int ret;

		lpfc_cmd->rdata = rdata;
		ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, FCP_TARGET_RESET);
		ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, lun,
		FCP_TARGET_RESET);
		if (!ret)
		return FAILED;

		@@ -977,12 +979,12 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
		if (lpfc_cmd == NULL)
		goto out;

		lpfc_cmd->pCmd = cmnd;
		lpfc_cmd->timeout = 60;
		lpfc_cmd->scsi_hba = phba;
		lpfc_cmd->rdata = rdata;

		ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, FCP_LUN_RESET);
		ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, cmnd->device->lun,
		FCP_LUN_RESET);
		if (!ret)
		goto out_free_scsi_buf;

		@@ -1009,7 +1011,6 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
		cmd_status = iocbqrsp->iocb.ulpStatus;

		lpfc_sli_release_iocbq(phba, iocbqrsp);
		lpfc_release_scsi_buf(phba, lpfc_cmd);

		/*
		* All outstanding txcmplq I/Os should have been aborted by the device.
		@@ -1048,6 +1049,8 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
		}

		out_free_scsi_buf:
		lpfc_release_scsi_buf(phba, lpfc_cmd);

		lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
		"%d:0713 SCSI layer issued LUN reset (%d, %d) "
		"Data: x%x x%x x%x\n",
		@@ -1078,7 +1081,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)

		/* The lpfc_cmd storage is reused. Set all loop invariants. */
		lpfc_cmd->timeout = 60;
		lpfc_cmd->pCmd = cmnd;
		lpfc_cmd->scsi_hba = phba;

		/*
		@@ -1098,8 +1100,8 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
		if (!match)
		continue;

		ret = lpfc_scsi_tgt_reset(lpfc_cmd, phba,
		i, ndlp->rport->dd_data);
		ret = lpfc_scsi_tgt_reset(lpfc_cmd, phba, i, cmnd->device->lun,
		ndlp->rport->dd_data);
		if (ret != SUCCESS) {
		lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
		"%d:0713 Bus Reset on target %d failed\n",

Admin message