Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

iwlwifi: fix kernel crash when unregistering thermal zone 




[ Upstream commit 92549cdc288f47f3a98cf80ac5890c91f5876a06 ]

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 <axboe@fb.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 322baf72

drivers/net/wireless/intel/iwlwifi/mvm/tt.c

+8 −4
Original line number Diff line number Diff line
@@ -843,9 +843,11 @@ static void iwl_mvm_thermal_zone_unregister(struct iwl_mvm *mvm) 
		return;



	IWL_DEBUG_TEMP(mvm, "Thermal zone device unregister\n");

	if (mvm->tz_device.tzone) {

		thermal_zone_device_unregister(mvm->tz_device.tzone);

		mvm->tz_device.tzone = NULL;

	}

}



static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)

{
@@ -853,9 +855,11 @@ static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm) 
		return;



	IWL_DEBUG_TEMP(mvm, "Cooling device unregister\n");

	if (mvm->cooling_dev.cdev) {

		thermal_cooling_device_unregister(mvm->cooling_dev.cdev);

		mvm->cooling_dev.cdev = NULL;

	}

}

#endif /* CONFIG_THERMAL */



void iwl_mvm_thermal_initialize(struct iwl_mvm *mvm, u32 min_backoff)