intel_th: Fix a resource leak in an error handling path
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 5 Jul 2022 08:26:32 +0000 (11:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:49 +0000 (14:23 +0200)
[ Upstream commit 086c28ab7c5699256aced0049aae9c42f1410313 ]

If an error occurs after calling 'pci_alloc_irq_vectors()',
'pci_free_irq_vectors()' must be called as already done in the remove
function.

Fixes: 7b7036d47c35 ("intel_th: pci: Use MSI interrupt signalling")
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Link: https://lore.kernel.org/r/20220705082637.59979-2-alexander.shishkin@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hwtracing/intel_th/pci.c

index 7da4f29..fcd0aca 100644 (file)
@@ -100,8 +100,10 @@ static int intel_th_pci_probe(struct pci_dev *pdev,
                }
 
        th = intel_th_alloc(&pdev->dev, drvdata, resource, r);
-       if (IS_ERR(th))
-               return PTR_ERR(th);
+       if (IS_ERR(th)) {
+               err = PTR_ERR(th);
+               goto err_free_irq;
+       }
 
        th->activate   = intel_th_pci_activate;
        th->deactivate = intel_th_pci_deactivate;
@@ -109,6 +111,10 @@ static int intel_th_pci_probe(struct pci_dev *pdev,
        pci_set_master(pdev);
 
        return 0;
+
+err_free_irq:
+       pci_free_irq_vectors(pdev);
+       return err;
 }
 
 static void intel_th_pci_remove(struct pci_dev *pdev)