thermal/of: Fix potential uninitialized value access

[ Upstream commit f96801f0cfcefc0a16b146596577c53c75ee9773 ]

If of_parse_phandle_with_args() called from __thermal_of_bind() or
__thermal_of_unbind() fails, cooling_spec.np will not be initialized,
so move the of_node_put() calls below the respective return value checks
to avoid dereferencing an uninitialized pointer.

Fixes: 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree initialization")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index aacba30bc10c19e5cea2abc5a793c200a95c02f0..762d1990180bf717f80a0007481013e355423c7a 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -409,13 +409,13 @@ static int __thermal_of_unbind(struct device_node *map_np, int index, int trip_i
        ret = of_parse_phandle_with_args(map_np, "cooling-device", "#cooling-cells",
                                         index, &cooling_spec);
 
-       of_node_put(cooling_spec.np);
-
        if (ret < 0) {
                pr_err("Invalid cooling-device entry\n");
                return ret;
        }
 
+       of_node_put(cooling_spec.np);
+
        if (cooling_spec.args_count < 2) {
                pr_err("wrong reference to cooling device, missing limits\n");
                return -EINVAL;
@@ -442,13 +442,13 @@ static int __thermal_of_bind(struct device_node *map_np, int index, int trip_id,
        ret = of_parse_phandle_with_args(map_np, "cooling-device", "#cooling-cells",
                                         index, &cooling_spec);
 
-       of_node_put(cooling_spec.np);
-
        if (ret < 0) {
                pr_err("Invalid cooling-device entry\n");
                return ret;
        }
 
+       of_node_put(cooling_spec.np);
+
        if (cooling_spec.args_count < 2) {
                pr_err("wrong reference to cooling device, missing limits\n");
                return -EINVAL;