6.12-stable patches

added patches:
	thermal-gov_power_allocator-add-missing-null-pointer-check.patch

diff --git a/queue-6.12/series b/queue-6.12/series
index 77bb5a81024e8e1ebeb06e422ed546f5d91b66ff..85aeb765f0c8ca9b85fc821973b9e81461f70b87 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -148,3 +148,4 @@ x86-microcode-amd-merge-early_apply_microcode-into-its-single-callsite.patch
 x86-microcode-amd-get-rid-of-the-_load_microcode_amd-forward-declaration.patch
 x86-microcode-amd-add-get_patch_level.patch
 x86-microcode-amd-load-only-sha256-checksummed-patches.patch
+thermal-gov_power_allocator-add-missing-null-pointer-check.patch

diff --git a/queue-6.12/thermal-gov_power_allocator-add-missing-null-pointer-check.patch b/queue-6.12/thermal-gov_power_allocator-add-missing-null-pointer-check.patch
new file mode 100644 (file)
index 0000000..3f94d94
--- /dev/null
+++ b/queue-6.12/thermal-gov_power_allocator-add-missing-null-pointer-check.patch
@@ -0,0 +1,47 @@
+From ac1f43c03fc91eee53cc95683245350d4d87781e Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Mon, 25 Nov 2024 12:24:46 +0100
+Subject: thermal: gov_power_allocator: Add missing NULL pointer check
+
+From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+commit ac1f43c03fc91eee53cc95683245350d4d87781e upstream.
+
+Commit 0dc23567c206 ("thermal: core: Move lists of thermal instances
+to trip descriptors") overlooked the case in which the Power Allocator
+governor attempts to bind to a tripless thermal zone and params->trip_max
+is NULL in check_power_actors().
+
+No power actors can be found in that case, so check_power_actors() needs
+to be made return 0 then to restore its previous behavior.
+
+Fixes: 0dc23567c206 ("thermal: core: Move lists of thermal instances to trip descriptors")
+Closes: https://lore.kernel.org/linux-pm/Z0NeGF4ryCe_b5rr@sashalap/
+Reported-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
+Link: https://patch.msgid.link/2761105.mvXUDI8C0e@rjwysocki.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/thermal/gov_power_allocator.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/thermal/gov_power_allocator.c
++++ b/drivers/thermal/gov_power_allocator.c
+@@ -582,10 +582,15 @@ static void allow_maximum_power(struct t
+ static int check_power_actors(struct thermal_zone_device *tz,
+                             struct power_allocator_params *params)
+ {
+-      const struct thermal_trip_desc *td = trip_to_trip_desc(params->trip_max);
++      const struct thermal_trip_desc *td;
+       struct thermal_instance *instance;
+       int ret = 0;
+ 
++      if (!params->trip_max)
++              return 0;
++
++      td = trip_to_trip_desc(params->trip_max);
++
+       list_for_each_entry(instance, &td->thermal_instances, trip_node) {
+               if (!cdev_is_power_actor(instance->cdev)) {
+                       dev_warn(&tz->device, "power_allocator: %s is not a power actor\n",