From: Liu Zhenlong <dragonliu2018@gmail.com>
To: andi.shyti@kernel.org, chris.packham@alliedtelesis.co.nz,
jochen@scram.de, maddy@linux.ibm.com, vz@mleia.com,
piotr.wojtaszczyk@timesys.com
Cc: mpe@ellerman.id.uk, npiggin@gmail.com, chleroy@kernel.org,
grant.likely@secretlab.ca, neelegup@linux.vnet.ibm.com,
benh@kernel.crashing.org, wsa@kernel.org, stigge@antcom.de,
linux-i2c@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Liu Zhenlong <dragonliu2018@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 5/5] i2c: pnx: fix device_node refcount leak in i2c_pnx_probe()/i2c_pnx_remove()
Date: Sun, 16 Aug 2026 02:12:04 +0800 [thread overview]
Message-ID: <20260815181204.2321-6-dragonliu2018@gmail.com> (raw)
In-Reply-To: <20260815181204.2321-1-dragonliu2018@gmail.com>
i2c_pnx_probe() calls of_node_get() to take an extra reference on the
platform device's of_node when assigning it to the adapter device, but
none of the probe error paths nor i2c_pnx_remove() drops it.
device_release() does not call of_node_put() and i2c_adapter_dev_release()
only completes a struct, so the extra reference is never released, leaking
the device_node on every probe failure and every adapter removal.
Add the matching of_node_put() to all probe error paths (the three early
return paths before clk_prepare_enable(), and the out_clock label which
covers the wait_reset(), platform_get_irq(), devm_request_irq() and
i2c_add_numbered_adapter() failure paths; dev is devm_kzalloc'ed so
adapter.dev.of_node is NULL and of_node_put() is a no-op when CONFIG_OF
is not set) and to i2c_pnx_remove().
In i2c_pnx_remove(), i2c_del_adapter() clears adap->dev with memset()
at the end (commit bd4bc3dbded9 ("i2c: Clear i2c_adapter.dev on adapter
removal")), which zeroes adap->dev.of_node before of_node_put() runs.
Cache the pointer before calling i2c_del_adapter(), the same approach
used in i2c-mux (i2c_mux_del_adapters) and mtd (commit 56570bdad5e3
("mtd: core: Fix refcount error in del_mtd_device()")).
Compile-tested with gcc on arm64 defconfig using COMPILE_TEST; no
hardware available for runtime testing.
Fixes: b41a216dafe4 ("i2c: Add device tree support to i2c-pnx.c")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-5
Signed-off-by: Liu Zhenlong <dragonliu2018@gmail.com>
---
drivers/i2c/busses/i2c-pnx.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 8daa0008bd05..0b6c144d9a21 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -644,20 +644,26 @@ static int i2c_pnx_probe(struct platform_device *pdev)
}
#endif
alg_data->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(alg_data->clk))
+ if (IS_ERR(alg_data->clk)) {
+ of_node_put(alg_data->adapter.dev.of_node);
return PTR_ERR(alg_data->clk);
+ }
snprintf(alg_data->adapter.name, sizeof(alg_data->adapter.name),
"%s", pdev->name);
/* Register I/O resource */
alg_data->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- if (IS_ERR(alg_data->ioaddr))
+ if (IS_ERR(alg_data->ioaddr)) {
+ of_node_put(alg_data->adapter.dev.of_node);
return PTR_ERR(alg_data->ioaddr);
+ }
ret = clk_prepare_enable(alg_data->clk);
- if (ret)
+ if (ret) {
+ of_node_put(alg_data->adapter.dev.of_node);
return ret;
+ }
freq = clk_get_rate(alg_data->clk);
@@ -707,14 +713,17 @@ static int i2c_pnx_probe(struct platform_device *pdev)
out_clock:
clk_disable_unprepare(alg_data->clk);
+ of_node_put(alg_data->adapter.dev.of_node);
return ret;
}
static void i2c_pnx_remove(struct platform_device *pdev)
{
struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
+ struct device_node *node = alg_data->adapter.dev.of_node;
i2c_del_adapter(&alg_data->adapter);
+ of_node_put(node);
clk_disable_unprepare(alg_data->clk);
}
--
2.55.0
prev parent reply other threads:[~2026-08-15 18:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260815181204.2321-1-dragonliu2018@gmail.com>
2026-08-15 18:12 ` [PATCH 1/5] i2c: mpc: fix device_node refcount leak in fsl_i2c_probe()/fsl_i2c_remove() Liu Zhenlong
2026-08-15 18:12 ` [PATCH 2/5] i2c: cpm: fix device_node refcount leak in cpm_i2c_probe()/cpm_i2c_remove() Liu Zhenlong
2026-08-15 18:12 ` [PATCH 3/5] i2c: ibm_iic: fix device_node refcount leak in iic_probe()/iic_remove() Liu Zhenlong
2026-08-15 18:12 ` [PATCH 4/5] i2c: opal: fix device_node refcount leak in i2c_opal_probe/remove() Liu Zhenlong
2026-08-15 18:12 ` Liu Zhenlong [this message]
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=20260815181204.2321-6-dragonliu2018@gmail.com \
--to=dragonliu2018@gmail.com \
--cc=andi.shyti@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=chleroy@kernel.org \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=grant.likely@secretlab.ca \
--cc=jochen@scram.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=mpe@ellerman.id.uk \
--cc=neelegup@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=piotr.wojtaszczyk@timesys.com \
--cc=stable@vger.kernel.org \
--cc=stigge@antcom.de \
--cc=vz@mleia.com \
--cc=wsa@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