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

Commit d9954405 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: tt: move ucode_loaded check under mutex 



The ucode_loaded check should be under the mutex, since it can
otherwise change state after we looked at it and before we got
the mutex. Fix that.

Fixes: 5c89e7bc ("iwlwifi: mvm: add registration to cooling device")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ee48b722

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

+5 −3
Original line number Diff line number Diff line
@@ -790,11 +790,13 @@ static int iwl_mvm_tcool_set_cur_state(struct thermal_cooling_device *cdev, 
	struct iwl_mvm *mvm = (struct iwl_mvm *)(cdev->devdata);

	int ret;



	if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR))

		return -EIO;



	mutex_lock(&mvm->mutex);



	if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR)) {

		ret = -EIO;

		goto unlock;

	}



	if (new_state >= ARRAY_SIZE(iwl_mvm_cdev_budgets)) {

		ret = -EINVAL;

		goto unlock;