Commit 1a5cd3d0 authored by Justin Tee's avatar Justin Tee Committed by Martin K. Petersen
Browse files

scsi: lpfc: Simplify fcp_abort transport callback log message 



The driver is reaching into a nvme_fc_cmd_iu ptr that belongs to the
transport during an abort.  This could cause an unintentional ptr
dereference into memory that the driver does not own.  Since the
nvme_fc_cmd_iu ptr was for logging purposes only, simplify the log message
such that the nvme_fc_cmd_iu reference is no longer needed.

Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20230712180522.112722-3-justintee8345@gmail.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4cf7cfa8

drivers/scsi/lpfc/lpfc_nvme.c

+2 −9
Original line number Diff line number Diff line
@@ -1864,7 +1864,6 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, 
	struct lpfc_nvme_fcpreq_priv *freqpriv;

	unsigned long flags;

	int ret_val;

	struct nvme_fc_cmd_iu *cp;



	/* Validate pointers. LLDD fault handling with transport does

	 * have timing races.
@@ -1988,16 +1987,10 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, 
		return;

	}



	/*

	 * Get Command Id from cmd to plug into response. This

	 * code is not needed in the next NVME Transport drop.

	 */

	cp = (struct nvme_fc_cmd_iu *)lpfc_nbuf->nvmeCmd->cmdaddr;

	lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS,

			 "6138 Transport Abort NVME Request Issued for "

			 "ox_id x%x nvme opcode x%x nvme cmd_id x%x\n",

			 nvmereq_wqe->sli4_xritag, cp->sqe.common.opcode,

			 cp->sqe.common.command_id);

			 "ox_id x%x\n",

			 nvmereq_wqe->sli4_xritag);

	return;



out_unlock: