Commit 63e801ce authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.19: Fix critical errors and crashes 



Fix critical errors and crashes

- Replace LOF_SECURITY with LOG_SECURITY
- When calculating diag test memory size, use full size with header.
- Return LS_RJT with status=UNSUPPORTED on unrecognized ELS's
- Correct NULL pointer dereference when lpfc_create_vport_work_array()
  returns NULL.
- Added code to handle CVL when port is in LPFC_VPORT_FAILED state.
- In lpfc_do_scr_ns_plogi, check the nodelist for FDMI_DID and reuse
  the resource.
- Check for generic request 64 and calculate the sgl offset for the request
  and reply sgls, also calculate the xmit length using only the request bde.

Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 98db5195

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -2162,7 +2162,7 @@ lpfc_bsg_diag_test(struct fc_bsg_job *job) 
		goto loopback_test_exit;

	}



	if (size >= BUF_SZ_4K) {

	if (full_size >= BUF_SZ_4K) {

		/*

		 * Allocate memory for ioctl data. If buffer is bigger than 64k,

		 * then we allocate 64k and re-use that buffer over and over to
@@ -2171,7 +2171,7 @@ lpfc_bsg_diag_test(struct fc_bsg_job *job) 
		 * problem with GET_FCPTARGETMAPPING...

		 */

		if (size <= (64 * 1024))

			total_mem = size;

			total_mem = full_size;

		else

			total_mem = 64 * 1024;

	} else

drivers/scsi/lpfc/lpfc_els.c

+22 −9
Original line number Diff line number Diff line
@@ -6201,7 +6201,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
			cmd, did, vport->port_state);



		/* Unsupported ELS command, reject */

		rjt_err = LSRJT_INVALID_CMD;

		rjt_err = LSRJT_CMD_UNSUPPORTED;



		/* Unknown ELS command <elsCmd> received from NPORT <did> */

		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
@@ -6408,18 +6408,31 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport) 
	}



	if (vport->cfg_fdmi_on) {

		/* If this is the first time, allocate an ndlp and initialize

		 * it. Otherwise, make sure the node is enabled and then do the

		 * login.

		 */

		ndlp_fdmi = lpfc_findnode_did(vport, FDMI_DID);

		if (!ndlp_fdmi) {

			ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool,

						  GFP_KERNEL);

			if (ndlp_fdmi) {

				lpfc_nlp_init(vport, ndlp_fdmi, FDMI_DID);

				ndlp_fdmi->nlp_type |= NLP_FABRIC;

			} else

				return;

		}

		if (!NLP_CHK_NODE_ACT(ndlp_fdmi))

			ndlp_fdmi = lpfc_enable_node(vport,

						     ndlp_fdmi,

						     NLP_STE_NPR_NODE);



		if (ndlp_fdmi) {

			lpfc_nlp_set_state(vport, ndlp_fdmi,

					   NLP_STE_PLOGI_ISSUE);

			lpfc_issue_els_plogi(vport, ndlp_fdmi->nlp_DID,

					     0);

			lpfc_issue_els_plogi(vport, ndlp_fdmi->nlp_DID, 0);

		}

	}

	return;

}



/**

drivers/scsi/lpfc/lpfc_hbadisc.c

+9 −0
Original line number Diff line number Diff line
@@ -4059,6 +4059,11 @@ lpfc_unreg_hba_rpis(struct lpfc_hba *phba) 
	int i;



	vports = lpfc_create_vport_work_array(phba);

	if (!vports) {

		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,

			"2884 Vport array allocation failed \n");

		return;

	}

	for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {

		shost = lpfc_shost_from_vport(vports[i]);

		spin_lock_irq(shost->host_lock);
@@ -5254,6 +5259,10 @@ lpfc_fcf_inuse(struct lpfc_hba *phba) 


	vports = lpfc_create_vport_work_array(phba);



	/* If driver cannot allocate memory, indicate fcf is in use */

	if (!vports)

		return 1;



	for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {

		shost = lpfc_shost_from_vport(vports[i]);

		spin_lock_irq(shost->host_lock);

drivers/scsi/lpfc/lpfc_init.c

+4 −2
Original line number Diff line number Diff line
@@ -3247,10 +3247,12 @@ lpfc_sli4_perform_vport_cvl(struct lpfc_vport *vport) 
		if (!ndlp)

			return 0;

	}

	if (phba->pport->port_state < LPFC_FLOGI)

	if ((phba->pport->port_state < LPFC_FLOGI) &&

		(phba->pport->port_state != LPFC_VPORT_FAILED))

		return NULL;

	/* If virtual link is not yet instantiated ignore CVL */

	if ((vport != phba->pport) && (vport->port_state < LPFC_FDISC))

	if ((vport != phba->pport) && (vport->port_state < LPFC_FDISC)

		&& (vport->port_state != LPFC_VPORT_FAILED))

		return NULL;

	shost = lpfc_shost_from_vport(vport);

	if (!shost)

drivers/scsi/lpfc/lpfc_logmsg.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define LOG_FCP_ERROR	0x00001000	/* log errors, not underruns */

#define LOG_LIBDFC	0x00002000	/* Libdfc events */

#define LOG_VPORT	0x00004000	/* NPIV events */

#define LOF_SECURITY	0x00008000	/* Security events */

#define LOG_SECURITY	0x00008000	/* Security events */

#define LOG_EVENT	0x00010000	/* CT,TEMP,DUMP, logging */

#define LOG_FIP		0x00020000	/* FIP events */

#define LOG_ALL_MSG	0xffffffff	/* LOG all messages */