shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

thermal: of: Fix OF node leak in of_thermal_zone_find() error paths

Browse Source 
[ Upstream commit c0a1ef9c5be72ff28a5413deb1b3e1a066593c13 ]

Terminating for_each_available_child_of_node() loop requires dropping OF
node reference, so bailing out on errors misses this.  Solve the OF node
reference leak with scoped for_each_available_child_of_node_scoped().

Fixes: 3fd6d6e2b4 ("thermal/of: Rework the thermal device tree initialization")
Cc: <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-3-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:23 +02:00
committed by Greg Kroah-Hartman
parent ad638686c5
commit 0dff3dc75e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/thermal/thermal_of.c
View File

@@ -294,14 +294,14 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
* Search for each thermal zone, a defined sensor * Search for each thermal zone, a defined sensor
* corresponding to the one passed as parameter * corresponding to the one passed as parameter
*/ */
for_each_available_child_of_node(np, tz) { for_each_available_child_of_node_scoped(np, child) {
int count, i; int count, i;
count = of_count_phandle_with_args(tz, "thermal-sensors", count = of_count_phandle_with_args(child, "thermal-sensors",
"#thermal-sensor-cells"); "#thermal-sensor-cells");
if (count <= 0) { if (count <= 0) {
pr_err("%pOFn: missing thermal sensor\n", tz); pr_err("%pOFn: missing thermal sensor\n", child);
tz = ERR_PTR(-EINVAL); tz = ERR_PTR(-EINVAL);
goto out; goto out;
} }
@@ -310,18 +310,19 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
int ret; int ret;
ret = of_parse_phandle_with_args(tz, "thermal-sensors", ret = of_parse_phandle_with_args(child, "thermal-sensors",
"#thermal-sensor-cells", "#thermal-sensor-cells",
i, &sensor_specs); i, &sensor_specs);
if (ret < 0) { if (ret < 0) {
pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", tz, ret); pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret);
tz = ERR_PTR(ret); tz = ERR_PTR(ret);
goto out; goto out;
} }
if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ? if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?
sensor_specs.args[0] : 0)) { sensor_specs.args[0] : 0)) {
pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, tz); pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);
tz = no_free_ptr(child);
goto out; goto out;
} }
} }