Commit 82598b4f authored May 13, 2013 by Johannes Berg

iwlwifi: mvm: fix NVM parsing error path



If NVM parsing fails and returns NULL, we continue in
the code flow and eventually crash accessing the NULL
pointer. Return an error from iwl_nvm_init() if the
parsing failed.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent bf0fd5da

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -231,8 +231,9 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
		if (ret < 0)
		return ret;

		ret = 0;
		mvm->nvm_data = iwl_parse_nvm_sections(mvm);
		if (!mvm->nvm_data)
		return -ENODATA;

		return ret;
		return 0;
		}