On Wed, Aug 14, 2024 at 09:58:21PM +0200, Krzysztof Kozlowski wrote:
> Terminating for_each_child_of_node() loop requires dropping OF node
> reference, so bailing out after thermal_of_populate_trip() error misses
> this. Solve the OF node reference leak with scoped
> for_each_child_of_node_scoped().
>
> Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately")
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Reviewed-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> ---
> drivers/thermal/thermal_of.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
> index aa34b6e82e26..30f8d6e70484 100644
> --- a/drivers/thermal/thermal_of.c
> +++ b/drivers/thermal/thermal_of.c
> @@ -125,7 +125,7 @@ static int thermal_of_populate_trip(struct device_node *np,
> static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips)
> {
> struct thermal_trip *tt;
> - struct device_node *trips, *trip;
> + struct device_node *trips;
> int ret, count;
>
> trips = of_get_child_by_name(np, "trips");
> @@ -150,7 +150,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n
> *ntrips = count;
>
> count = 0;
> - for_each_child_of_node(trips, trip) {
> + for_each_child_of_node_scoped(trips, trip) {
> ret = thermal_of_populate_trip(trip, &tt[count++]);
> if (ret)
> goto out_kfree;
> --
> 2.43.0
>
