Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ecd6564 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: fix fcport null pointer access. 



This patch allocates DMA memory to prevent NULL pointer access for ct_sns
request while sending switch commands.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 51fd6e63

drivers/scsi/qla2xxx/qla_init.c

+12 −3
Original line number Diff line number Diff line
@@ -4755,6 +4755,16 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags) 
	if (!fcport)

		return NULL;



	fcport->ct_desc.ct_sns = dma_alloc_coherent(&vha->hw->pdev->dev,

		sizeof(struct ct_sns_pkt), &fcport->ct_desc.ct_sns_dma,

		flags);

	if (!fcport->ct_desc.ct_sns) {

		ql_log(ql_log_warn, vha, 0xd049,

		    "Failed to allocate ct_sns request.\n");

		kfree(fcport);

		return NULL;

	}



	/* Setup fcport template structure. */

	fcport->vha = vha;

	fcport->port_type = FCT_UNKNOWN;
@@ -4763,13 +4773,11 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags) 
	fcport->supported_classes = FC_COS_UNSPECIFIED;

	fcport->fp_speed = PORT_SPEED_UNKNOWN;



	fcport->ct_desc.ct_sns = dma_alloc_coherent(&vha->hw->pdev->dev,

		sizeof(struct ct_sns_pkt), &fcport->ct_desc.ct_sns_dma,

		flags);

	fcport->disc_state = DSC_DELETED;

	fcport->fw_login_state = DSC_LS_PORT_UNAVAIL;

	fcport->deleted = QLA_SESS_DELETED;

	fcport->login_retry = vha->hw->login_retry_count;

	fcport->chip_reset = vha->hw->base_qpair->chip_reset;

	fcport->logout_on_delete = 1;



	if (!fcport->ct_desc.ct_sns) {
@@ -4778,6 +4786,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags) 
		kfree(fcport);

		fcport = NULL;

	}



	INIT_WORK(&fcport->del_work, qla24xx_delete_sess_fn);

	INIT_WORK(&fcport->reg_work, qla_register_fcport_fn);

	INIT_LIST_HEAD(&fcport->gnl_entry);