Commit 78e1d200 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix defects reported by Coverity Scan 



Addressed the following reported defects:

** CID 1411552:  Control flow issues  (MISSING_BREAK)
/drivers/scsi/lpfc/lpfc_sli.c: 13259 in lpfc_sli4_nvmet_handle_rcqe()

** CID 1411553:  Memory - illegal accesses  (OVERRUN)
/drivers/scsi/lpfc/lpfc_sli.c: 16218 in lpfc_fc_frame_check()

** CID 1411553:  Memory - illegal accesses  (OVERRUN)
   Overrunning array "lpfc_rctl_names" of 202 8-byte elements at element
   index 244 (byte offset 1952) using index "fc_hdr->fh_r_ctl" (which
   evaluates to 244).

** CID 1411554:  Null pointer dereferences  (REVERSE_INULL)
/drivers/scsi/lpfc/lpfc_nvmet.c: 2131 in lpfc_nvmet_unsol_fcp_abort_cmp()

** CID 1411555:  Memory - illegal accesses  (UNINIT)
/drivers/scsi/lpfc/lpfc_nvmet.c: 180 in lpfc_nvmet_ctxbuf_post()

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b57ab746

drivers/scsi/lpfc/lpfc_nvmet.c

+4 −6
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf) 
	struct lpfc_nvmet_tgtport *tgtp;

	struct fc_frame_header *fc_hdr;

	struct rqb_dmabuf *nvmebuf;

	struct lpfc_dmabuf *hbufp;

	uint32_t *payload;

	uint32_t size, oxid, sid, rc;

	unsigned long iflag;
@@ -191,7 +190,6 @@ lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba, struct lpfc_nvmet_ctxbuf *ctx_buf) 


	spin_lock_irqsave(&phba->sli4_hba.nvmet_io_wait_lock, iflag);

	if (phba->sli4_hba.nvmet_io_wait_cnt) {

		hbufp = &nvmebuf->hbuf;

		list_remove_head(&phba->sli4_hba.lpfc_nvmet_io_wait_list,

				 nvmebuf, struct rqb_dmabuf,

				 hbuf.list);
@@ -2164,10 +2162,6 @@ lpfc_nvmet_unsol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
	status = bf_get(lpfc_wcqe_c_status, wcqe);

	result = wcqe->parameter;



	tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;

	if (ctxp->flag & LPFC_NVMET_ABORT_OP)

		atomic_inc(&tgtp->xmt_fcp_abort_cmpl);



	if (!ctxp) {

		/* if context is clear, related io alrady complete */

		lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,
@@ -2177,6 +2171,10 @@ lpfc_nvmet_unsol_fcp_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
		return;

	}



	tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;

	if (ctxp->flag & LPFC_NVMET_ABORT_OP)

		atomic_inc(&tgtp->xmt_fcp_abort_cmpl);



	/* Sanity check */

	if (ctxp->state != LPFC_NVMET_STE_ABORT) {

		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_ABTS,

drivers/scsi/lpfc/lpfc_sli.c

+9 −15
Original line number Diff line number Diff line
@@ -13267,6 +13267,7 @@ lpfc_sli4_nvmet_handle_rcqe(struct lpfc_hba *phba, struct lpfc_queue *cq, 
	case FC_STATUS_RQ_BUF_LEN_EXCEEDED:

		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

				"6126 Receive Frame Truncated!!\n");

		/* Drop thru */

	case FC_STATUS_RQ_SUCCESS:

		lpfc_sli4_rq_release(hrq, drq);

		spin_lock_irqsave(&phba->hbalock, iflags);
@@ -16137,9 +16138,6 @@ lpfc_sli4_post_scsi_sgl_block(struct lpfc_hba *phba, 
	return rc;

}









static char *lpfc_rctl_names[] = FC_RCTL_NAMES_INIT;









static char *lpfc_type_names[] = FC_TYPE_NAMES_INIT;

















/**









 * lpfc_fc_frame_check - Check that this frame is a valid frame to handle









 * @phba: pointer to lpfc_hba struct that the frame was received on








@@ -16214,22 +16212,18 @@ lpfc_fc_frame_check(struct lpfc_hba *phba, struct fc_frame_header *fc_hdr)







	}

















	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,









			"2538 Received frame rctl:%s (x%x), type:%s (x%x), "









			"2538 Received frame rctl:x%x, type:x%x, "









			"frame Data:%08x %08x %08x %08x %08x %08x %08x\n",









			(fc_hdr->fh_r_ctl == FC_RCTL_MDS_DIAGS) ? "MDS Diags" :









			lpfc_rctl_names[fc_hdr->fh_r_ctl], fc_hdr->fh_r_ctl,









			(fc_hdr->fh_type == FC_TYPE_VENDOR_UNIQUE) ?









			"Vendor Unique" : lpfc_type_names[fc_hdr->fh_type],









			fc_hdr->fh_type, be32_to_cpu(header[0]),









			be32_to_cpu(header[1]), be32_to_cpu(header[2]),









			be32_to_cpu(header[3]), be32_to_cpu(header[4]),









			be32_to_cpu(header[5]), be32_to_cpu(header[6]));









			fc_hdr->fh_r_ctl, fc_hdr->fh_type,









			be32_to_cpu(header[0]), be32_to_cpu(header[1]),









			be32_to_cpu(header[2]), be32_to_cpu(header[3]),









			be32_to_cpu(header[4]), be32_to_cpu(header[5]),









			be32_to_cpu(header[6]));









	return 0;









drop:









	lpfc_printf_log(phba, KERN_WARNING, LOG_ELS,









			"2539 Dropped frame rctl:%s type:%s\n",









			lpfc_rctl_names[fc_hdr->fh_r_ctl],









			lpfc_type_names[fc_hdr->fh_type]);









			"2539 Dropped frame rctl:x%x type:x%x\n",









			fc_hdr->fh_r_ctl, fc_hdr->fh_type);









	return 1;









}










































































CRA Git | Maintained and supported by SUSTech CRA and CCSE