Re: [PATCH v2] clk: add missing of_node_put() in "assigned-clocks" property parsing

[Clément Léger]

Le Mon, 20 Feb 2023 12:44:20 +0100,
Clément Léger <clement.leger@xxxxxxxxxxx> a écrit :

Gentle ping.

> Le Tue, 31 Jan 2023 09:32:27 +0100,
> Clément Léger <clement.leger@xxxxxxxxxxx> a écrit :
> 
> Ping ?
> 
> > When returning from of_parse_phandle_with_args(), the np member of the
> > of_phandle_args structure should be put after usage. Add missing
> > of_node_put() calls in both __set_clk_parents() and __set_clk_rates().
> > 
> > Fixes: 86be408bfbd8 ("clk: Support for clock parents and rates assigned from device tree")
> > Signed-off-by: Clément Léger <clement.leger@xxxxxxxxxxx>
> > ---
> > v2:
> >  - Add "Fixes"
> > 
> >  drivers/clk/clk-conf.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
> > index 2ef819606c41..1a4e6340f95c 100644
> > --- a/drivers/clk/clk-conf.c
> > +++ b/drivers/clk/clk-conf.c
> > @@ -33,9 +33,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
> >  			else
> >  				return rc;
> >  		}
> > -		if (clkspec.np == node && !clk_supplier)
> > +		if (clkspec.np == node && !clk_supplier) {
> > +			of_node_put(clkspec.np);
> >  			return 0;
> > +		}
> >  		pclk = of_clk_get_from_provider(&clkspec);
> > +		of_node_put(clkspec.np);
> >  		if (IS_ERR(pclk)) {
> >  			if (PTR_ERR(pclk) != -EPROBE_DEFER)
> >  				pr_warn("clk: couldn't get parent clock %d for %pOF\n",
> > @@ -48,10 +51,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
> >  		if (rc < 0)
> >  			goto err;
> >  		if (clkspec.np == node && !clk_supplier) {
> > +			of_node_put(clkspec.np);
> >  			rc = 0;
> >  			goto err;
> >  		}
> >  		clk = of_clk_get_from_provider(&clkspec);
> > +		of_node_put(clkspec.np);
> >  		if (IS_ERR(clk)) {
> >  			if (PTR_ERR(clk) != -EPROBE_DEFER)
> >  				pr_warn("clk: couldn't get assigned clock %d for %pOF\n",
> > @@ -93,10 +98,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)
> >  				else
> >  					return rc;
> >  			}
> > -			if (clkspec.np == node && !clk_supplier)
> > +			if (clkspec.np == node && !clk_supplier) {
> > +				of_node_put(clkspec.np);
> >  				return 0;
> > +			}
> >  
> >  			clk = of_clk_get_from_provider(&clkspec);
> > +			of_node_put(clkspec.np);
> >  			if (IS_ERR(clk)) {
> >  				if (PTR_ERR(clk) != -EPROBE_DEFER)
> >  					pr_warn("clk: couldn't get clock %d for %pOF\n",  
> 
> 
> 



-- 
Clément Léger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com