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

Commit 9375939f authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Fix a qla24xx_enable_msix() error path 



[ Upstream commit 24afabdbd0b3553963a2bbf465895492b14d1107 ]

Make sure that the allocated interrupts are freed if allocating memory for
the msix_entries array fails.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4e0c06e0

drivers/scsi/qla2xxx/qla_isr.c

+5 −1
Original line number Diff line number Diff line
@@ -3089,7 +3089,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) 
		ql_log(ql_log_fatal, vha, 0x00c8,

		    "Failed to allocate memory for ha->msix_entries.\n");

		ret = -ENOMEM;

		goto msix_out;

		goto free_irqs;

	}

	ha->flags.msix_enabled = 1;
@@ -3177,6 +3177,10 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) 
msix_out:

	kfree(entries);

	return ret;



free_irqs:

	pci_free_irq_vectors(ha->pdev);

	goto msix_out;

}



int