]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
thermal: gov_power_allocator: Add missing NULL pointer check
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Nov 2024 11:24:46 +0000 (12:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 17:25:46 +0000 (18:25 +0100)
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

index 8117959dc6c4271ed816e506bfd63c9e4994cd71..90b4bfd9237bce63bb67b1345b385f0bc1d04370 100644 (file)
@@ -582,10 +582,15 @@ static void allow_maximum_power(struct thermal_zone_device *tz)
 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",