mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
thermal/of: Fix potential uninitialized value access
[ Upstream commitf96801f0cf
] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7c70932568
commit
7da6250d29
1 changed files with 4 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue