Re: [PATCH] Input: sparcspkr: Fix refcount leak in bbc_beep_probe

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Miaoqian Lin <linmq006@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: sparcspkr: Fix refcount leak in bbc_beep_probe
Date: Mon, 16 May 2022 15:08:12 -0700	[thread overview]
Message-ID: <YoLLTBALPU1O8VI5@google.com> (raw)
In-Reply-To: <20220516081018.42728-1-linmq006@gmail.com>

Hi 
On Mon, May 16, 2022 at 12:10:16PM +0400, Miaoqian Lin wrote:
> of_find_node_by_path() calls of_find_node_opts_by_path(),
> which returns a node pointer with refcount
> incremented, we should use of_node_put() on it when done.
> Add missing of_node_put() to avoid refcount leak.
> 
> Fixes: 9c1a5077fdca ("input: Rewrite sparcspkr device probing.")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---

Thank you for the patch.

>  drivers/input/misc/sparcspkr.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
> index fe43e5557ed7..6a86900aa1fb 100644
> --- a/drivers/input/misc/sparcspkr.c
> +++ b/drivers/input/misc/sparcspkr.c
> @@ -206,11 +206,11 @@ static int bbc_beep_probe(struct platform_device *op)
>  	info = &state->u.bbc;
>  	info->clock_freq = of_getintprop_default(dp, "clock-frequency", 0);
>  	if (!info->clock_freq)
> -		goto out_free;
> +		goto out_put;
>  
>  	info->regs = of_ioremap(&op->resource[0], 0, 6, "bbc beep");
>  	if (!info->regs)
> -		goto out_free;
> +		goto out_put;
>  
>  	platform_set_drvdata(op, state);
>  
> @@ -218,11 +218,14 @@ static int bbc_beep_probe(struct platform_device *op)
>  	if (err)
>  		goto out_clear_drvdata;
>  
> +	of_node_put(dp);
> +

We do not really need to keep node pointer for that long, how about the
version of your patch below?

Thanks.

-- 
Dmitry


Input: sparcspkr - fix refcount leak in bbc_beep_probe

From: Miaoqian Lin <linmq006@gmail.com>

of_find_node_by_path() calls of_find_node_opts_by_path(),
which returns a node pointer with refcount
incremented, we should use of_node_put() on it when done.
Add missing of_node_put() to avoid refcount leak.

Fixes: 9c1a5077fdca ("input: Rewrite sparcspkr device probing.")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220516081018.42728-1-linmq006@gmail.com
Patchwork-Id: 12850379
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/sparcspkr.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index fe43e5557ed7..cdcb7737c46a 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -205,6 +205,7 @@ static int bbc_beep_probe(struct platform_device *op)
 
 	info = &state->u.bbc;
 	info->clock_freq = of_getintprop_default(dp, "clock-frequency", 0);
+	of_node_put(dp);
 	if (!info->clock_freq)
 		goto out_free;
 
