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

Commit 27873de9 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix a recently introduced memory leak 



qla2x00_probe_one() allocates IRQs before it initializes rsp_q_map so
IRQs must be freed even if rsp_q_map allocation did not occur.  This was
detected by kmemleak.

Fixes: 4fa18345 ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/pci_free_irq_vectors calls")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Michael Hernandez <michael.hernandez@cavium.com>
Cc: Himanshu Madhani <himanshu.madhani@cavium.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-By: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 773c7220

drivers/scsi/qla2xxx/qla_isr.c

+2 −1
Original line number Diff line number Diff line
@@ -3237,7 +3237,7 @@ qla2x00_free_irqs(scsi_qla_host_t *vha) 
	 * from a probe failure context.

	 */

	if (!ha->rsp_q_map || !ha->rsp_q_map[0])

		return;

		goto free_irqs;

	rsp = ha->rsp_q_map[0];



	if (ha->flags.msix_enabled) {
@@ -3257,6 +3257,7 @@ qla2x00_free_irqs(scsi_qla_host_t *vha) 
		free_irq(pci_irq_vector(ha->pdev, 0), rsp);

	}



free_irqs:

	pci_free_irq_vectors(ha->pdev);

}