瀏覽代碼

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>
Johannes Berg 12 年之前
父節點
當前提交
82598b4f43
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/net/wireless/iwlwifi/mvm/nvm.c

+ 3 - 2
drivers/net/wireless/iwlwifi/mvm/nvm.c

@@ -231,8 +231,9 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
 	if (ret < 0)
 	if (ret < 0)
 		return ret;
 		return ret;
 
 
-	ret = 0;
 	mvm->nvm_data = iwl_parse_nvm_sections(mvm);
 	mvm->nvm_data = iwl_parse_nvm_sections(mvm);
+	if (!mvm->nvm_data)
+		return -ENODATA;
 
 
-	return ret;
+	return 0;
 }
 }