Commit e9a87e0f authored by Jens Axboe's avatar Jens Axboe Committed by Greg Kroah-Hartman

iwlwifi: fix kernel crash when unregistering thermal zone

[ Upstream commit 92549cdc ]

A recent firmware change seems to have enabled thermal zones on the
iwlwifi driver. Unfortunately, my device fails when registering the
thermal zone. This doesn't stop the driver from attempting to unregister
the thermal zone at unload time, triggering a NULL pointer deference in
strlen() off the thermal_zone_device_unregister() path.

Don't unregister if name is NULL, for that case we failed registering.
Do the same for the cooling zone.
Signed-off-by: default avatarJens Axboe <>
Signed-off-by: default avatarKalle Valo <>
Signed-off-by: default avatarSasha Levin <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 322baf72
......@@ -843,8 +843,10 @@ static void iwl_mvm_thermal_zone_unregister(struct iwl_mvm *mvm)
IWL_DEBUG_TEMP(mvm, "Thermal zone device unregister\n");
if (mvm->tz_device.tzone) {
mvm->tz_device.tzone = NULL;
static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)
......@@ -853,8 +855,10 @@ static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)
IWL_DEBUG_TEMP(mvm, "Cooling device unregister\n");
if (mvm->cooling_dev.cdev) {
mvm->cooling_dev.cdev = NULL;
#endif /* CONFIG_THERMAL */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment