MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-08 10:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: of: Fix OF node leak in thermal_of_trips_init() error path

Browse Source 
[ Upstream commit afc954fd22 ]

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: d0c75fa2c1 ("thermal/of: Initialize trip points separately")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/20240814195823.437597-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-08-14 21:58:21 +02:00 committed by Greg Kroah-Hartman
parent 0199a29ec6
commit 31019a2ab4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/thermal/thermal_of.c
View File

@ -123,7 +123,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) static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips)
{ {
struct thermal_trip *tt; struct thermal_trip *tt;
struct device_node *trips, *trip; struct device_node *trips;
int ret, count; int ret, count;
trips = of_get_child_by_name(np, "trips"); trips = of_get_child_by_name(np, "trips");
@ -148,7 +148,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n
*ntrips = count; *ntrips = count;
count = 0; 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++]); ret = thermal_of_populate_trip(trip, &tt[count++]);
if (ret) if (ret)
goto out_kfree; goto out_kfree;