Date:   Mon, 20 Feb 2023 12:44:20 +0100
From:   =?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?= <clement.leger@bootlin.com>
To:     Sylwester Nawrocki <s.nawrocki@samsung.com>,
        Michael Turquette <mturquette@baylibre.com>,
        Stephen Boyd <sboyd@kernel.org>
Cc:     Rob Herring <robh+dt@kernel.org>,
        Frank Rowand <frowand.list@gmail.com>,
        linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] clk: add missing of_node_put() in "assigned-clocks"
 property parsing
Message-ID: <20230220124420.4150c767@fixe.home>
In-Reply-To: <20230131083227.10990-1-clement.leger@bootlin.com>
References: <20230131083227.10990-1-clement.leger@bootlin.com>
Organization: Bootlin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Le Tue, 31 Jan 2023 09:32:27 +0100,
Cl=C3=A9ment L=C3=A9ger <clement.leger@bootlin.com> a =C3=A9crit :

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().
>=20
> Fixes: 86be408bfbd8 ("clk: Support for clock parents and rates assigned f=
rom device tree")
> Signed-off-by: Cl=C3=A9ment L=C3=A9ger <clement.leger@bootlin.com>
> ---
> v2:
>  - Add "Fixes"
>=20
>  drivers/clk/clk-conf.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>=20
> 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 =3D=3D node && !clk_supplier)
> +		if (clkspec.np =3D=3D node && !clk_supplier) {
> +			of_node_put(clkspec.np);
>  			return 0;
> +		}
>  		pclk =3D of_clk_get_from_provider(&clkspec);
> +		of_node_put(clkspec.np);
>  		if (IS_ERR(pclk)) {
>  			if (PTR_ERR(pclk) !=3D -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 =3D=3D node && !clk_supplier) {
> +			of_node_put(clkspec.np);
>  			rc =3D 0;
>  			goto err;
>  		}
>  		clk =3D of_clk_get_from_provider(&clkspec);
> +		of_node_put(clkspec.np);
>  		if (IS_ERR(clk)) {
>  			if (PTR_ERR(clk) !=3D -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 =3D=3D node && !clk_supplier)
> +			if (clkspec.np =3D=3D node && !clk_supplier) {
> +				of_node_put(clkspec.np);
>  				return 0;
> +			}
> =20
>  			clk =3D of_clk_get_from_provider(&clkspec);
> +			of_node_put(clkspec.np);
>  			if (IS_ERR(clk)) {
>  				if (PTR_ERR(clk) !=3D -EPROBE_DEFER)
>  					pr_warn("clk: couldn't get clock %d for %pOF\n",


--=20
Cl=C3=A9ment L=C3=A9ger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com