]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: aspeed: Fix IRQ domain leak on platform_get_irq() failure
authorFelix Gu <ustc.gu@gmail.com>
Mon, 23 Mar 2026 17:57:59 +0000 (01:57 +0800)
committerManivannan Sadhasivam <mani@kernel.org>
Sat, 4 Apr 2026 10:32:55 +0000 (16:02 +0530)
The aspeed_pcie_probe() function calls aspeed_pcie_init_irq_domain()
which allocates pcie->intx_domain and initializes MSI. However, if
platform_get_irq() fails afterwards, the cleanup action was not yet
registered via devm_add_action_or_reset(), causing the IRQ domain
resources to leak.

Fix this by registering the devm cleanup action immediately after
aspeed_pcie_init_irq_domain() succeeds, before calling
platform_get_irq(). This ensures proper cleanup on any subsequent
failure.

Fixes: 9aa0cb68fcc1 ("PCI: aspeed: Add ASPEED PCIe RC driver")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Tested-by: Jacky Chou <jacky_chou@aspeedtech.com>
Link: https://patch.msgid.link/20260324-aspeed-v1-1-354181624c00@gmail.com
drivers/pci/controller/pcie-aspeed.c

index 3e1a39d1e64842fff227ffe8b3d5e3a46d68c1aa..6acfae7d026e45901a85cf16bdc8b20293c95cfb 100644 (file)
@@ -1052,14 +1052,14 @@ static int aspeed_pcie_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               return irq;
-
        ret = devm_add_action_or_reset(dev, aspeed_pcie_irq_domain_free, pcie);
        if (ret)
                return ret;
 
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0)
+               return irq;
+
        ret = devm_request_irq(dev, irq, aspeed_pcie_intr_handler, IRQF_SHARED,
                               dev_name(dev), pcie);
        if (ret)