Commit eb016566 authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

lpfc: fix low priority issues from fortify source code scan 



Fixed Low priority issues from lpfc given by fortify source code scan.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarDick Kennedy <dick.kennedy@emulex.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a2fc4aef

drivers/scsi/lpfc/lpfc_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -3385,7 +3385,7 @@ lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr, 
		if (strlen(buf) > (LPFC_MAX_DATA_CTRL_LEN - 1))

			return -EINVAL;



		strcpy(bucket_data, buf);

		strncpy(bucket_data, buf, LPFC_MAX_DATA_CTRL_LEN);

		str_ptr = &bucket_data[0];

		/* Ignore this token - this is command token */

		token = strsep(&str_ptr, "\t ");

drivers/scsi/lpfc/lpfc_bsg.c

+0 −5
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 
	struct lpfc_nodelist *ndlp = rdata->pnode;

	uint32_t elscmd;

	uint32_t cmdsize;

	uint32_t rspsize;

	struct lpfc_iocbq *cmdiocbq;

	uint16_t rpi = 0;

	struct bsg_job_data *dd_data;
@@ -687,7 +686,6 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 


	elscmd = job->request->rqst_data.r_els.els_code;

	cmdsize = job->request_payload.payload_len;

	rspsize = job->reply_payload.payload_len;



	if (!lpfc_nlp_get(ndlp)) {

		rc = -ENODEV;
@@ -2251,7 +2249,6 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job) 
	i = 0;

	while (phba->link_state != LPFC_LINK_DOWN) {

		if (i++ > timeout) {

			rc = -ETIMEDOUT;

			lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,

					"3140 Timeout waiting for link to "

					"diagnostic mode_end, timeout:%d ms\n",
@@ -2291,7 +2288,6 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job) 
	LPFC_MBOXQ_t *pmboxq;

	struct sli4_link_diag *link_diag_test_cmd;

	uint32_t req_len, alloc_len;

	uint32_t timeout;

	struct lpfc_mbx_run_link_diag_test *run_link_diag_test;

	union lpfc_sli4_cfg_shdr *shdr;

	uint32_t shdr_status, shdr_add_status;
@@ -2342,7 +2338,6 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job) 


	link_diag_test_cmd = (struct sli4_link_diag *)

			 job->request->rqst_data.h_vendor.vendor_cmd;

	timeout = link_diag_test_cmd->timeout * 100;



	rc = lpfc_sli4_bsg_set_link_diag_state(phba, 1);

drivers/scsi/lpfc/lpfc_ct.c

+8 −6
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #2 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(MANUFACTURER);

			strcpy(ae->un.Manufacturer, "Emulex Corporation");

			strncpy(ae->un.Manufacturer, "Emulex Corporation", 64);

			len = strlen(ae->un.Manufacturer);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1449,7 +1449,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #3 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(SERIAL_NUMBER);

			strcpy(ae->un.SerialNumber, phba->SerialNumber);

			strncpy(ae->un.SerialNumber, phba->SerialNumber, 64);

			len = strlen(ae->un.SerialNumber);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1459,7 +1459,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #4 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(MODEL);

			strcpy(ae->un.Model, phba->ModelName);

			strncpy(ae->un.Model, phba->ModelName, 256);

			len = strlen(ae->un.Model);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1469,7 +1469,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #5 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(MODEL_DESCRIPTION);

			strcpy(ae->un.ModelDescription, phba->ModelDesc);

			strncpy(ae->un.ModelDescription, phba->ModelDesc, 256);

			len = strlen(ae->un.ModelDescription);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1500,7 +1500,8 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #7 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(DRIVER_VERSION);

			strcpy(ae->un.DriverVersion, lpfc_release_version);

			strncpy(ae->un.DriverVersion,

				lpfc_release_version, 256);

			len = strlen(ae->un.DriverVersion);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
@@ -1510,7 +1511,8 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode) 
			/* #8 HBA attribute entry */

			ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);

			ae->ad.bits.AttrType = be16_to_cpu(OPTION_ROM_VERSION);

			strcpy(ae->un.OptionROMVersion, phba->OptionROMVersion);

			strncpy(ae->un.OptionROMVersion,

				phba->OptionROMVersion, 256);

			len = strlen(ae->un.OptionROMVersion);

			len += (len & 3) ? (4 - (len & 3)) : 4;

			ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int 
lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)

{

	int len = 0;

	int cnt, i, j, found, posted, low;

	int i, j, found, posted, low;

	uint32_t phys, raw_index, getidx;

	struct lpfc_hbq_init *hip;

	struct hbq_s *hbqs;
@@ -279,7 +279,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) 


	if (phba->sli_rev != 3)

		return 0;

	cnt = LPFC_HBQINFO_SIZE;



	spin_lock_irq(&phba->hbalock);



	/* toggle between multiple hbqs, if any */

drivers/scsi/lpfc/lpfc_els.c

+4 −12
Original line number Diff line number Diff line
@@ -1829,7 +1829,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	IOCB_t *irsp;

	struct lpfc_nodelist *ndlp;

	struct lpfc_dmabuf *prsp;

	int disc, rc, did, type;

	int disc, rc;



	/* we pass cmdiocb to state machine which needs rspiocb as well */

	cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -1874,10 +1874,6 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		goto out;

	}



	/* ndlp could be freed in DSM, save these values now */

	type = ndlp->nlp_type;

	did = ndlp->nlp_DID;



	if (irsp->ulpStatus) {

		/* Check for retry */

		if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
@@ -2270,8 +2266,6 @@ lpfc_adisc_done(struct lpfc_vport *vport) 
void

lpfc_more_adisc(struct lpfc_vport *vport)

{

	int sentadisc;



	if (vport->num_disc_nodes)

		vport->num_disc_nodes--;

	/* Continue discovery with <num_disc_nodes> ADISCs to go */
@@ -2284,7 +2278,7 @@ lpfc_more_adisc(struct lpfc_vport *vport) 
	if (vport->fc_flag & FC_NLP_MORE) {

		lpfc_set_disctmo(vport);

		/* go thru NPR nodes and issue any remaining ELS ADISCs */

		sentadisc = lpfc_els_disc_adisc(vport);

		lpfc_els_disc_adisc(vport);

	}

	if (!vport->num_disc_nodes)

		lpfc_adisc_done(vport);
@@ -3028,10 +3022,9 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp) 
{

	struct lpfc_vport *vport = ndlp->vport;

	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);

	uint32_t cmd, did, retry;

	uint32_t cmd, retry;



	spin_lock_irq(shost->host_lock);

	did = ndlp->nlp_DID;

	cmd = ndlp->nlp_last_elscmd;

	ndlp->nlp_last_elscmd = 0;
@@ -5289,10 +5282,9 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	IOCB_t *icmd;

	RNID *rn;

	struct ls_rjt stat;

	uint32_t cmd, did;

	uint32_t cmd;



	icmd = &cmdiocb->iocb;

	did = icmd->un.elsreq64.remoteID;

	pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;

	lp = (uint32_t *) pcmd->virt;