From mboxrd@z Thu Jan 1 00:00:00 1970 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 3FE9F3F44D5; Fri, 15 May 2026 16:12:49 +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=1778861569; cv=none; b=RIhP8z16bjKRCfxaA8bEmdzawdOIVk1tLfjhSJAP3TWFiwaq8pqB5eeoLxsi/qmmEj/A8d1WRJRemcOkqAU9r5sMPBUBSy+HsiDyk8mLbhOsLI9EECDKbmmaLpFyKBHVfRfQNrZmxipwK00r07fRgLQz4H0K2IMZMYEJl79Vx+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861569; c=relaxed/simple; bh=dGZuyYDv4D7JbOBYk5nxUbaSRhJbKTIgBdnKVcSznck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MhG4M+jUmWGJB5vcQa4rQqolAGDrp1ln6p8m4hmbTRJAgGeKQGOMl1EFMsGyxcq3m1TC+SyaIQGJP+nqtTD5orpdhQG51mSp1FOjBWeNILGRAjMeEgNpV3D9EPWrj2+DoveFNJGBISejJ883QyS2QhPogzYMZq/YYq0LCFAucuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Uuv6ScaZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Uuv6ScaZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C920AC2BCB3; Fri, 15 May 2026 16:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861569; bh=dGZuyYDv4D7JbOBYk5nxUbaSRhJbKTIgBdnKVcSznck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uuv6ScaZRE89SFj2J8Ox5X6fqaoKlZQsu8/rSRcREoaP2hSswDNjw4KL09esGJ1xt V/2T7qLt+nNwa3KG4JBHmU+pnGRbN8nPL1cOjIntQPz5keTRkNPSRgW7wJCE5Wg1t8 McVT8sFSAKZub06OHlgCtkZIkGX7cpL3KtyfXGEQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.6 377/474] thermal: core: Fix thermal zone governor cleanup issues Date: Fri, 15 May 2026 17:48:06 +0200 Message-ID: <20260515154723.188617112@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 [ kept the `thermal_zone_create_device_groups(tz, mask)` signature when adding the new failure-path cleanup ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/thermal_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -804,6 +804,7 @@ static void thermal_release(struct devic sizeof("thermal_zone") - 1)) { tz = to_thermal_zone(dev); thermal_zone_destroy_device_groups(tz); + thermal_set_governor(tz, NULL); mutex_destroy(&tz->lock); complete(&tz->removal); } else if (!strncmp(dev_name(dev), "cooling_device", @@ -1325,8 +1326,10 @@ thermal_zone_device_register_with_trips( /* 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); @@ -1478,8 +1481,6 @@ void thermal_zone_device_unregister(stru cancel_delayed_work_sync(&tz->poll_queue); - thermal_set_governor(tz, NULL); - thermal_remove_hwmon_sysfs(tz); ida_free(&thermal_tz_ida, tz->id); ida_destroy(&tz->ida);