| From e4ac79b77296045b931df770623e073521a46182 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Wed, 17 Apr 2019 14:44:24 -0700 |
| Subject: 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: Bart Van Assche <bvanassche@acm.org> |
| Acked-by: Himanshu Madhani <hmadhani@marvell.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/qla2xxx/qla_isr.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c |
| index 69bbea9239cc8..add17843148dd 100644 |
| --- a/drivers/scsi/qla2xxx/qla_isr.c |
| +++ b/drivers/scsi/qla2xxx/qla_isr.c |
| @@ -3475,7 +3475,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; |
| |
| @@ -3558,6 +3558,10 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) |
| |
| msix_out: |
| return ret; |
| + |
| +free_irqs: |
| + pci_free_irq_vectors(ha->pdev); |
| + goto msix_out; |
| } |
| |
| int |
| -- |
| 2.20.1 |
| |