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

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

iwlwifi: mvm: make iwl_mvm_update_mcc() easier to follow 



Some static checkers (e.g. smatch) complain about the logic, saying that
resp_cp might be leaked. Clearly that isn't true, but making the logic
easier to follow does not result in any significant code changes and makes
the code more readable by moving the NULL check closer to its source.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent e9eb0fa2

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

+14 −15
Original line number Diff line number Diff line
@@ -779,6 +779,10 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2, 
		resp_len = sizeof(struct iwl_mcc_update_resp) +

			   n_channels * sizeof(__le32);

		resp_cp = kmemdup(mcc_resp, resp_len, GFP_KERNEL);

		if (!resp_cp) {

			resp_cp = ERR_PTR(-ENOMEM);

			goto exit;

		}

	} else {

		struct iwl_mcc_update_resp_v1 *mcc_resp_v1 = (void *)pkt->data;
@@ -786,8 +790,11 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2, 
		resp_len = sizeof(struct iwl_mcc_update_resp) +

			   n_channels * sizeof(__le32);

		resp_cp = kzalloc(resp_len, GFP_KERNEL);

		if (!resp_cp) {

			resp_cp = ERR_PTR(-ENOMEM);

			goto exit;

		}



		if (resp_cp) {

		resp_cp->status = mcc_resp_v1->status;

		resp_cp->mcc = mcc_resp_v1->mcc;

		resp_cp->cap = mcc_resp_v1->cap;
@@ -796,12 +803,6 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2, 
		memcpy(resp_cp->channels, mcc_resp_v1->channels,

		       n_channels * sizeof(__le32));

	}

	}



	if (!resp_cp) {

		ret = -ENOMEM;

		goto exit;

	}



	status = le32_to_cpu(resp_cp->status);
@@ -820,8 +821,6 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2, 


exit:

	iwl_free_resp(&cmd);

	if (ret)

		return ERR_PTR(ret);

	return resp_cp;

}