Skip to contentSkip to conversation

thermal/of: fix error code in of_thermal_zone_find()

PATCH Applied Dan Carpenter 2 participants 2 messages Aug 8, 2022 – Aug 23, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thermal/of: fix error code in of_thermal_zone_find()

Currently, if we cannot find the correct thermal zone then this error path returns NULL and it would lead to an Oops in the caller. Return ERR_PTR(-EINVAL) instead.

Fixes 3bd52ac87347 ("thermal/of: Rework the thermal device tree initialization")

---
I don't know if this error path is really possible. It's from static analysis.

 drivers/thermal/thermal_of.c | 1 +
 1 file changed, 1 insertion(+)
drivers/thermal/thermal_of.c +1 -0
index c2bb5954b21e..368eb58e97cf 100644
@@ -368,6 +368,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
 			}
 		}
 	}
+	tz = ERR_PTR(-EINVAL);
 out:
 	of_node_put(np);
 	return tz;
Signature · 1 line
2.35.1
#1 lore raw

[thermal: thermal/next] thermal/of: Fix error code in of_thermal_zone_find()

The following commit has been merged into the thermal/next branch of thermal:

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     45b8850b3d3071d5ea9e19ad4a29ad5f0b5d1ec1
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//45b8850b3d3071d5ea9e19ad4a29ad5f0b5d1ec1
Author:        Dan Carpenter <[email protected]>
AuthorDate:    Tue, 09 Aug 2022 10:56:26 +02:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Wed, 17 Aug 2022 14:09:37 +02:00

thermal/of: Fix error code in of_thermal_zone_find()

Currently, if we cannot find the correct thermal zone then this error path returns NULL and it would lead to an Oops in the caller. Return ERR_PTR(-EINVAL) instead.

Fixes 3bd52ac87347 ("thermal/of: Rework the thermal device tree initialization")
---
 drivers/thermal/thermal_of.c | 1 +
 1 file changed, 1 insertion(+)
drivers/thermal/thermal_of.c +1 -0
index 82236fe..15b342f 100644
@@ -1102,6 +1102,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int 
 			}
 		}
 	}
+	tz = ERR_PTR(-EINVAL);
 out:
 	of_node_put(np);
 	return tz;