[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <hxxoboh4z7wrstodn3g263zj334sybearuj53myhmzmnocywij@w3rkiu7xiaxi>
Date: Thu, 18 Dec 2025 18:44:27 +0530
From: Manivannan Sadhasivam <mani@...nel.org>
To: Haotian Zhang <vulab@...as.ac.cn>
Cc: lpieralisi@...nel.org, kwilczynski@...nel.org, robh@...nel.org,
bhelgaas@...gle.com, michal.simek@....com, linux-pci@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] PCI: xilinx: Fix INTx IRQ domain leak when MSI
allocation fails
On Thu, Dec 18, 2025 at 06:23:14PM +0800, Haotian Zhang wrote:
> In xilinx_pcie_init_irq_domain(), if xilinx_allocate_msi_domains()
> fails after pcie->leg_domain has been successfully created via
> irq_domain_create_linear(), the function returns directly without
> cleaning up the allocated IRQ domain, resulting in a resource leak.
>
> Add irq_domain_remove() call in the error path to properly release the
> IRQ domain before returning the error.
>
> Fixes: 313b64c3ae52 ("PCI: xilinx: Convert to MSI domains")
> Suggested-by: Manivannan Sadhasivam <mani@...nel.org>
Sorry, I didn't suggest this change ;)
> Signed-off-by: Haotian Zhang <vulab@...as.ac.cn>
> ---
> Changes in v2:
> - Correct the Fixes tag to point to the commit that introduced the
> legacy IRQ domain leak on MSI allocation failure.
> ---
> drivers/pci/controller/pcie-xilinx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
> index 937ea6ae1ac4..e8cf320f3764 100644
> --- a/drivers/pci/controller/pcie-xilinx.c
> +++ b/drivers/pci/controller/pcie-xilinx.c
> @@ -480,8 +480,10 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie *pcie)
> phys_addr_t pa = ALIGN_DOWN(virt_to_phys(pcie), SZ_4K);
>
> ret = xilinx_allocate_msi_domains(pcie);
> - if (ret)
> + if (ret) {
> + irq_domain_remove(pcie->leg_domain);
> return ret;
> + }
Looks like this domain is not removed in the further failure path. You need to
rename xilinx_free_msi_domains() to xilinx_free_irq_domains() and remove this
domain in that function as well.
- Mani
--
மணிவண்ணன் சதாசிவம்
Powered by blists - more mailing lists