Fixes for 6.1

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/series b/queue-6.1/series
index c2ef3cb8c69db01d74707b395982c0436764b7dd..8bbd17397d9ca4407c283a06881252d650fa7fd2 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -45,3 +45,4 @@ sctp-sysctl-auth_enable-avoid-using-current-nsproxy.patch
 sctp-sysctl-udp_port-avoid-using-current-nsproxy.patch
 sctp-sysctl-plpmtud_probe_interval-avoid-using-current-nsproxy.patch
 drm-amd-display-add-check-for-granularity-in-dml-ceil-floor-helpers.patch
+thermal-of-fix-of-node-leak-in-of_thermal_zone_find.patch

diff --git a/queue-6.1/thermal-of-fix-of-node-leak-in-of_thermal_zone_find.patch b/queue-6.1/thermal-of-fix-of-node-leak-in-of_thermal_zone_find.patch
new file mode 100644 (file)
index 0000000..3f3f069
--- /dev/null
+++ b/queue-6.1/thermal-of-fix-of-node-leak-in-of_thermal_zone_find.patch
@@ -0,0 +1,39 @@
+From d5e8c341e5aa80e1525c25316ab1e40461757be9 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 24 Dec 2024 12:18:09 +0900
+Subject: thermal: of: fix OF node leak in of_thermal_zone_find()
+
+From: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
+
+[ Upstream commit 9164e0912af206a72ddac4915f7784e470a04ace ]
+
+of_thermal_zone_find() calls of_parse_phandle_with_args(), but does not
+release the OF node reference obtained by it.
+
+Add a of_node_put() call when the call is successful.
+
+Fixes: 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree initialization")
+Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
+Link: https://patch.msgid.link/20241224031809.950461-1-joe@pf.is.s.u-tokyo.ac.jp
+[ rjw: Changelog edit ]
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/thermal/thermal_of.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
+index 07476147559a..95939df314d1 100644
+--- a/drivers/thermal/thermal_of.c
++++ b/drivers/thermal/thermal_of.c
+@@ -315,6 +315,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
+                               goto out;
+                       }
+ 
++                      of_node_put(sensor_specs.np);
+                       if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?
+                                                                 sensor_specs.args[0] : 0)) {
+                               pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);
+-- 
+2.39.5
+