i2c: sun6i-p2wi: Fix device node reference leak in p2wi_probe()

[PATCH] i2c: sun6i-p2wi: Fix device node reference leak in p2wi_probe()

Posted by Felix Gu 6 days, 16 hours ago

Use the __free(device_node) scoped variable to automatically release
the device node reference, preventing a device node reference leak.

Fixes: 3e833490fae5 ("i2c: sunxi: add P2WI (Push/Pull 2 Wire Interface) controller support")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
 drivers/i2c/busses/i2c-sun6i-p2wi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
index fb5280b8cf7f..652b37b57159 100644
--- a/drivers/i2c/busses/i2c-sun6i-p2wi.c
+++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
@@ -184,7 +184,6 @@ static int p2wi_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct device_node *np = dev->of_node;
-	struct device_node *childnp;
 	unsigned long parent_clk_freq;
 	u32 clk_freq = I2C_MAX_STANDARD_MODE_FREQ;
 	struct p2wi *p2wi;
@@ -223,7 +222,8 @@ static int p2wi_probe(struct platform_device *pdev)
 	 * In this case the target_addr is set to -1 and won't be checked when
 	 * launching a P2WI transfer.
 	 */
-	childnp = of_get_next_available_child(np, NULL);
+	struct device_node *childnp __free(device_node) =
+		of_get_next_available_child(np, NULL);
 	if (childnp) {
 		ret = of_property_read_u32(childnp, "reg", &target_addr);
 		if (ret) {

---
base-commit: 33a647c659ffa5bdb94abc345c8c86768ff96215
change-id: 20260201-p2wi-a199cdfe69e0

Best regards,
-- 
Felix Gu <ustc.gu@gmail.com>

Re: [PATCH] i2c: sun6i-p2wi: Fix device node reference leak in p2wi_probe()

Posted by Andi Shyti 3 days, 2 hours ago

Hi Felix,

On Sun, Feb 01, 2026 at 02:29:00AM +0800, Felix Gu wrote:
> Use the __free(device_node) scoped variable to automatically release
> the device node reference, preventing a device node reference leak.
> 
> Fixes: 3e833490fae5 ("i2c: sunxi: add P2WI (Push/Pull 2 Wire Interface) controller support")
> Signed-off-by: Felix Gu <ustc.gu@gmail.com>
> ---
>  drivers/i2c/busses/i2c-sun6i-p2wi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
> index fb5280b8cf7f..652b37b57159 100644
> --- a/drivers/i2c/busses/i2c-sun6i-p2wi.c
> +++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
> @@ -184,7 +184,6 @@ static int p2wi_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
>  	struct device_node *np = dev->of_node;
> -	struct device_node *childnp;
>  	unsigned long parent_clk_freq;
>  	u32 clk_freq = I2C_MAX_STANDARD_MODE_FREQ;
>  	struct p2wi *p2wi;
> @@ -223,7 +222,8 @@ static int p2wi_probe(struct platform_device *pdev)
>  	 * In this case the target_addr is set to -1 and won't be checked when
>  	 * launching a P2WI transfer.
>  	 */
> -	childnp = of_get_next_available_child(np, NULL);
> +	struct device_node *childnp __free(device_node) =
> +		of_get_next_available_child(np, NULL);

A few spontaneous questions here:

- Why are you moving the declaration of childnp in the middle of
  the function?

- Have you run checkpatch.pl before sending the patch?

- Is of_get_next_available_child() allocating the device_node?

- Have you tested the patch?

Thanks,
Andi

>  	if (childnp) {
>  		ret = of_property_read_u32(childnp, "reg", &target_addr);
>  		if (ret) {
> 
> ---
> base-commit: 33a647c659ffa5bdb94abc345c8c86768ff96215
> change-id: 20260201-p2wi-a199cdfe69e0
> 
> Best regards,
> -- 
> Felix Gu <ustc.gu@gmail.com>
>