thermal/of: Fix potential uninitialized value access
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: 3fd6d6e2b4
("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>
This commit is contained in:
Родитель
b616959a59
Коммит
f96801f0cf
|
@ -291,13 +291,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;
|
||||
|
@ -324,13 +324,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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче