Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 808AD2C3255 for ; Thu, 30 Apr 2026 18:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777575454; cv=none; b=cMcwxiMFkOXSIDJ9HdF123x6y9GZiGPGc/tg/5pRe8wSKWuTiZOlw1SV7ROosa8QYg2V47Md13HpRj/uGDO+1eogzP66MVsZa5qUxDRg8rdYUhGB7+VfRTrwGNBHhnzqlHK8biaLoW0bdqx4tptHu5ErxbLEDAViX9HCByTtI5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777575454; c=relaxed/simple; bh=ZnSswOjvGiohGpqbT7CCtDLgNyvLenfhjkPZV9NwC8I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WJysKDgXtZF7L1goCwJ8rdy6J2FFeTaG5GOeIN7wsXIM37/4Sgi1pa7tSHKnsOaMeztgpld2qQ0jACNZiVVTUh0NXxVciB95L+HGNQa+JfN/eDySwGdZEHcXY4noyvHqiepPnU12gHepwD6ksApDl97ZC+MNhL+dmgqVPnKKslI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BmEWN1hP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BmEWN1hP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00C75C2BCB4; Thu, 30 Apr 2026 18:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777575454; bh=ZnSswOjvGiohGpqbT7CCtDLgNyvLenfhjkPZV9NwC8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BmEWN1hPFgVOWwDS8zxxeaGYsPDu7vlnSPCy6zqoSwlMJiYDdAtLa4OgBXuAxScgd 6MQfe7wr1DjLPMwsW7O8Za+DSHa9DunntXOJBgNjD0J+Y6bmLCJ89GZgBgKsGJzACL QhE3x5c9qLz3JMYTFjntFaA/4WO1/FYo3S4Z5SbwUk/I5cDa0TQJxuYnrPwfPoH7M4 0D6jF2pIvSQ7UnoBvLgHZ/LfE2+tAoeB2GfFLp9ECLJlhTj3fn48h5SeJgKMD1LUjo oAYORRz/ALiK4b/V+p3K8JwBdFe8kY9tsrBkALzcMtb7xJMsm9ENLzO/gpiiZn9lXs YVqoGJ2nUQKtw== From: Sasha Levin To: stable@vger.kernel.org Cc: "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.15.y] thermal: core: Fix thermal zone governor cleanup issues Date: Thu, 30 Apr 2026 14:57:32 -0400 Message-ID: <20260430185732.1955098-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026043039-tartar-feminize-ec26@gregkh> References: <2026043039-tartar-feminize-ec26@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Rafael J. Wysocki" [ Upstream commit 41ff66baf81c6541f4f985dd7eac4494d03d9440 ] If thermal_zone_device_register_with_trips() fails after adding a thermal governor to the thermal zone being registered, the governor is not removed from it as appropriate which may lead to a memory leak. In turn, thermal_zone_device_unregister() calls thermal_set_governor() without acquiring the thermal zone lock beforehand which may race with a governor update via sysfs and may lead to a use-after-free in that case. Address these issues by adding two thermal_set_governor() calls, one to thermal_release() to remove the governor from the given thermal zone, and one to the thermal zone registration error path to cover failures preceding the thermal zone device registration. Fixes: e33df1d2f3a0 ("thermal: let governors have private data for each thermal zone") Cc: All applicable Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/5092923.31r3eYUQgx@rafael.j.wysocki [ adapted context for missing mutex_destroy/complete ] Signed-off-by: Sasha Levin --- drivers/thermal/thermal_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index bb3a4b6720362..acea77b7c8d95 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -778,6 +778,7 @@ static void thermal_release(struct device *dev) sizeof("thermal_zone") - 1)) { tz = to_thermal_zone(dev); thermal_zone_destroy_device_groups(tz); + thermal_set_governor(tz, NULL); kfree(tz); } else if (!strncmp(dev_name(dev), "cooling_device", sizeof("cooling_device") - 1)) { @@ -1260,8 +1261,10 @@ thermal_zone_device_register(const char *type, int num_trips, int mask, /* sys I/F */ /* Add nodes that are always present via .groups */ result = thermal_zone_create_device_groups(tz, mask); - if (result) + if (result) { + thermal_set_governor(tz, NULL); goto remove_id; + } /* A new thermal zone needs to be updated anyway. */ atomic_set(&tz->need_update, 1); @@ -1385,8 +1388,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) cancel_delayed_work_sync(&tz->poll_queue); - thermal_set_governor(tz, NULL); - thermal_remove_hwmon_sysfs(tz); ida_simple_remove(&thermal_tz_ida, tz->id); ida_destroy(&tz->ida); -- 2.53.0