Re: [PATCH 6.6.y] thermal: core: Free thermal zone ID later during removal

[Greg KH <greg@kroah.com>]

On Thu, May 14, 2026 at 03:26:09PM -0400, Sasha Levin wrote:
> From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> 
> [ Upstream commit daae9c18feec74566e023fc88cfb0ce26e39d868 ]
> 
> The thermal zone removal ordering is different from the thermal zone
> registration rollback path ordering and the former is arguably
> problematic because freeing a thermal zone ID prematurely may cause
> it to be used during the registration of another thermal zone which
> may fail as a result.
> 
> Prevent that from occurring by changing the thermal zone removal
> ordering to reflect the thermal zone registration rollback path
> ordering.
> 
> Also more the ida_destroy() call from thermal_zone_device_unregister()
> to thermal_release() for consistency.
> 
> Fixes: b31ef8285b19 ("thermal core: convert ID allocation to IDA")
> Cc: All applicable <stable@vger.kernel.org>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Link: https://patch.msgid.link/5063934.GXAFRqVoOG@rafael.j.wysocki
> [ Context ]
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  drivers/thermal/thermal_core.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 660a8d6f35673..f8f18c3ebdda4 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -804,6 +804,7 @@ static void thermal_release(struct device *dev)
>  		     sizeof("thermal_zone") - 1)) {
>  		tz = to_thermal_zone(dev);
>  		thermal_zone_destroy_device_groups(tz);
> +		ida_destroy(&tz->ida);
>  		mutex_destroy(&tz->lock);
>  		complete(&tz->removal);
>  	} else if (!strncmp(dev_name(dev), "cooling_device",
> @@ -1481,8 +1482,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
>  	thermal_set_governor(tz, NULL);
>  
>  	thermal_remove_hwmon_sysfs(tz);
> -	ida_free(&thermal_tz_ida, tz->id);
> -	ida_destroy(&tz->ida);
>  
>  	device_del(&tz->device);
>  	put_device(&tz->device);
> @@ -1490,6 +1489,9 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
>  	thermal_notify_tz_delete(tz_id);
>  
>  	wait_for_completion(&tz->removal);
> +
> +	ida_free(&thermal_tz_ida, tz->id);
> +
>  	kfree(tz->tzp);
>  	kfree(tz);
>  }
> -- 
> 2.53.0
> 
> 

Does not apply at all :(