FAILED: patch "[PATCH] scsi: qla2xxx: Fix a recently introduced memory leak" failed to apply to 4.9-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
27873de99f2fecca0f6b257316489ef2a1d86ffdMon Sep 17 00:00:00 2001
From: Bart Van Assche <[email protected]>
Date: Mon, 23 Jan 2017 08:34:45 -0800
Subject: [PATCH] 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 4fa183455988 ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/pci_free_irq_vectors calls")
Signed-off-by Bart Van Assche <[email protected]>
Cc Michael Hernandez <[email protected]>
Cc Himanshu Madhani <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Acked-by Himanshu Madhani <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Signed-off-by Martin K. Petersen <[email protected]>
drivers/scsi/qla2xxx/qla_isr.c +2 -1
@@ -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); }