]> www.infradead.org Git - users/hch/misc.git/commitdiff
i2c: amd-mp2: drop free_irq() of devm_request_irq() allocated irq
authorYang Yingliang <yangyingliang@huawei.com>
Thu, 3 Nov 2022 12:11:46 +0000 (20:11 +0800)
committerAndi Shyti <andi.shyti@kernel.org>
Thu, 20 Mar 2025 13:37:47 +0000 (14:37 +0100)
irq allocated with devm_request_irq() will be freed in devm_irq_release(),
using free_irq() in ->remove() will causes a dangling pointer, and a
subsequent double free. So remove the free_irq() in the error path and
remove path.

Fixes: 969864efae78 ("i2c: amd-mp2: use msix/msi if the hardware supports")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20221103121146.99836-1-yangyingliang@huawei.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-amd-mp2-pci.c

index 14316530094968ab5a25ba03eecd0f132c2fc3ca..ef7370d3dbea318a8265f8014a46a94ba5b29aad 100644 (file)
@@ -327,13 +327,11 @@ static int amd_mp2_pci_init(struct amd_mp2_dev *privdata,
                              amd_mp2_irq_isr, irq_flag, dev_name(&pci_dev->dev), privdata);
        if (rc) {
                pci_err(pci_dev, "Failure requesting irq %i: %d\n", privdata->dev_irq, rc);
-               goto free_irq_vectors;
+               goto err_dma_mask;
        }
 
        return rc;
 
-free_irq_vectors:
-       free_irq(privdata->dev_irq, privdata);
 err_dma_mask:
        pci_clear_master(pci_dev);
 err_pci_enable:
@@ -376,7 +374,6 @@ static void amd_mp2_pci_remove(struct pci_dev *pci_dev)
        pm_runtime_forbid(&pci_dev->dev);
        pm_runtime_get_noresume(&pci_dev->dev);
 
-       free_irq(privdata->dev_irq, privdata);
        pci_clear_master(pci_dev);
 
        amd_mp2_clear_reg(privdata);