From: hanzhijian <hanzhijian1991@gmail.com>
To: "Richard Zhu" <hongxing.zhu@nxp.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: Rob Herring <robh@kernel.org>, Frank Li <Frank.Li@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
kernel@pengutronix.de, Fabio Estevam <festevam@gmail.com>,
linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
imx@lists.linux.dev, linux-kernel@vger.kernel.org,
hanzhijian <hanzhijian1991@gmail.com>,
sashiko-bot@kernel.org
Subject: [PATCH v2] PCI: imx6: fix resource leaks in probe error paths
Date: Sun, 23 Aug 2026 15:11:28 +0800 [thread overview]
Message-ID: <20260823071129.2980059-1-hanzhijian1991@gmail.com> (raw)
In-Reply-To: <20260823011125.2876504-1-hanzhijian1991@gmail.com>
imx_pcie_probe() leaks both pwrctrl devices and power domains on
failure:
- imx_pcie_attach_pd() attaches the "pcie" and "pcie_phy" power domains
and creates device links to them, but the device links are only kept
in a local variable and nothing detaches the domains on probe failure
or deferral, so all of them leak.
- A failure of devm_pm_runtime_set_active_enabled() returns directly
without destroying the pwrctrl devices.
- A partial failure inside imx_pcie_attach_pd() leaks the power domains
and device links that were already attached.
Save the device links, add imx_pcie_detach_pd() to release the power
domains and device links in reverse order of acquisition, call it from
the probe error paths, and make imx_pcie_attach_pd() release everything
it has attached so far on failure.
Reported-by: sashiko-bot@kernel.org
Link: https://lore.kernel.org/all/20260822013640.182C01F000E9@smtp.kernel.org/
Signed-off-by: hanzhijian <hanzhijian1991@gmail.com>
---
drivers/pci/controller/dwc/pci-imx6.c | 42 ++++++++++++++++++++++++---
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 39790e66b..a2bae4a2c 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -182,6 +182,9 @@ struct imx_pcie {
struct device *pd_pcie;
/* power domain for pcie phy */
struct device *pd_pcie_phy;
+ /* device links for the power domains */
+ struct device_link *pd_link;
+ struct device_link *pd_phy_link;
struct phy *phy;
const struct imx_pcie_drvdata *drvdata;
@@ -639,6 +642,26 @@ static int imx6q_pcie_abort_handler(unsigned long addr,
}
#endif
+static void imx_pcie_detach_pd(struct imx_pcie *imx_pcie)
+{
+ if (imx_pcie->pd_phy_link) {
+ device_link_del(imx_pcie->pd_phy_link);
+ imx_pcie->pd_phy_link = NULL;
+ }
+ if (!IS_ERR_OR_NULL(imx_pcie->pd_pcie_phy)) {
+ dev_pm_domain_detach(imx_pcie->pd_pcie_phy, true);
+ imx_pcie->pd_pcie_phy = NULL;
+ }
+ if (imx_pcie->pd_link) {
+ device_link_del(imx_pcie->pd_link);
+ imx_pcie->pd_link = NULL;
+ }
+ if (!IS_ERR_OR_NULL(imx_pcie->pd_pcie)) {
+ dev_pm_domain_detach(imx_pcie->pd_pcie, true);
+ imx_pcie->pd_pcie = NULL;
+ }
+}
+
static int imx_pcie_attach_pd(struct device *dev)
{
struct imx_pcie *imx_pcie = dev_get_drvdata(dev);
@@ -660,12 +683,18 @@ static int imx_pcie_attach_pd(struct device *dev)
DL_FLAG_RPM_ACTIVE);
if (!link) {
dev_err(dev, "Failed to add device_link to pcie pd\n");
+ imx_pcie_detach_pd(imx_pcie);
return -EINVAL;
}
+ imx_pcie->pd_link = link;
imx_pcie->pd_pcie_phy = dev_pm_domain_attach_by_name(dev, "pcie_phy");
- if (IS_ERR(imx_pcie->pd_pcie_phy))
- return PTR_ERR(imx_pcie->pd_pcie_phy);
+ if (IS_ERR(imx_pcie->pd_pcie_phy)) {
+ int ret = PTR_ERR(imx_pcie->pd_pcie_phy);
+
+ imx_pcie_detach_pd(imx_pcie);
+ return ret;
+ }
link = device_link_add(dev, imx_pcie->pd_pcie_phy,
DL_FLAG_STATELESS |
@@ -673,8 +702,10 @@ static int imx_pcie_attach_pd(struct device *dev)
DL_FLAG_RPM_ACTIVE);
if (!link) {
dev_err(dev, "Failed to add device_link to pcie_phy pd\n");
+ imx_pcie_detach_pd(imx_pcie);
return -EINVAL;
}
+ imx_pcie->pd_phy_link = link;
return 0;
}
@@ -1956,8 +1987,10 @@ static int imx_pcie_probe(struct platform_device *pdev)
return ret;
ret = pci_pwrctrl_create_devices(dev);
- if (ret)
+ if (ret) {
+ imx_pcie_detach_pd(imx_pcie);
return dev_err_probe(dev, ret, "failed to create pwrctrl devices\n");
+ }
pci->use_parent_dt_ranges = true;
if (imx_pcie->drvdata->mode == DW_PCIE_EP_TYPE) {
@@ -1975,7 +2008,7 @@ static int imx_pcie_probe(struct platform_device *pdev)
pm_runtime_no_callbacks(dev);
ret = devm_pm_runtime_set_active_enabled(dev);
if (ret < 0)
- return ret;
+ goto err_pwrctrl_destroy;
}
if (imx_check_flag(imx_pcie, IMX_PCIE_FLAG_SKIP_L23_READY))
@@ -1999,6 +2032,7 @@ static int imx_pcie_probe(struct platform_device *pdev)
return 0;
err_pwrctrl_destroy:
+ imx_pcie_detach_pd(imx_pcie);
if (ret != -EPROBE_DEFER)
pci_pwrctrl_destroy_devices(dev);
return ret;
--
2.43.0
next prev parent reply other threads:[~2026-08-23 7:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-23 1:11 [PATCH] PCI: imx6: fix power domain leak on probe failure hanzhijian
2026-08-23 7:11 ` hanzhijian [this message]
2026-08-24 7:55 ` [PATCH v3] PCI: imx6: fix resource leaks in probe error paths hanzhijian
2026-08-24 11:01 ` Markus Elfring
2026-08-24 14:42 ` Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260823071129.2980059-1-hanzhijian1991@gmail.com \
--to=hanzhijian1991@gmail.com \
--cc=Frank.Li@nxp.com \
--cc=bhelgaas@google.com \
--cc=festevam@gmail.com \
--cc=hongxing.zhu@nxp.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=kw@linux.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sashiko-bot@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox