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

Commit 26fa656e authored by Bill Kuzeja's avatar Bill Kuzeja Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure 



If HBA initialization fails unexpectedly (exiting via probe_failed:), we
may fail to free vha->gnl.l. So that we don't attempt to double free, set
this pointer to NULL after a free and check for NULL at probe_failed: so we
know whether or not to call dma_free_coherent.

Signed-off-by: default avatarBill Kuzeja <william.kuzeja@stratus.com>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a86c71ba

drivers/scsi/qla2xxx/qla_attr.c

+2 −0
Original line number Diff line number Diff line
@@ -2956,6 +2956,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) 
	dma_free_coherent(&ha->pdev->dev, vha->gnl.size, vha->gnl.l,

	    vha->gnl.ldma);



	vha->gnl.l = NULL;



	vfree(vha->scan.l);



	if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) {

drivers/scsi/qla2xxx/qla_os.c

+10 −1
Original line number Diff line number Diff line
@@ -3440,6 +3440,12 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return 0;



probe_failed:

	if (base_vha->gnl.l) {

		dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,

				base_vha->gnl.l, base_vha->gnl.ldma);

		base_vha->gnl.l = NULL;

	}



	if (base_vha->timer_active)

		qla2x00_stop_timer(base_vha);

	base_vha->flags.online = 0;
@@ -3673,7 +3679,7 @@ qla2x00_remove_one(struct pci_dev *pdev) 
	if (!atomic_read(&pdev->enable_cnt)) {

		dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,

		    base_vha->gnl.l, base_vha->gnl.ldma);



		base_vha->gnl.l = NULL;

		scsi_host_put(base_vha->host);

		kfree(ha);

		pci_set_drvdata(pdev, NULL);
@@ -3713,6 +3719,8 @@ qla2x00_remove_one(struct pci_dev *pdev) 
	dma_free_coherent(&ha->pdev->dev,

		base_vha->gnl.size, base_vha->gnl.l, base_vha->gnl.ldma);



	base_vha->gnl.l = NULL;



	vfree(base_vha->scan.l);



	if (IS_QLAFX00(ha))
@@ -4816,6 +4824,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht, 
		    "Alloc failed for scan database.\n");

		dma_free_coherent(&ha->pdev->dev, vha->gnl.size,

		    vha->gnl.l, vha->gnl.ldma);

		vha->gnl.l = NULL;

		scsi_remove_host(vha->host);

		return NULL;

	}