mirror of https://gitee.com/openkylin/linux.git
iwlwifi: mvm: fix memory leaks in error paths upon fw error dump
When iwl_mvm_fw_error_dump fails, it needs to clear the state in mvm, which includes: * clear IWL_MVM_STATUS_DUMPING_FW_LOG * set mvm->fw_dump_trig to NULL * free the description While at it, remove a NULL check in iwl_mvm_free_fw_dump_desc since kfree is NULL safe. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
parent
a80c7a6966
commit
9fb7807ce7
|
@ -270,8 +270,7 @@ static void iwl_mvm_dump_fifos(struct iwl_mvm *mvm,
|
||||||
|
|
||||||
void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm)
|
void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm)
|
||||||
{
|
{
|
||||||
if (mvm->fw_dump_desc == &iwl_mvm_dump_desc_assert ||
|
if (mvm->fw_dump_desc == &iwl_mvm_dump_desc_assert)
|
||||||
!mvm->fw_dump_desc)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
kfree(mvm->fw_dump_desc);
|
kfree(mvm->fw_dump_desc);
|
||||||
|
@ -441,7 +440,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
|
||||||
/* there's no point in fw dump if the bus is dead */
|
/* there's no point in fw dump if the bus is dead */
|
||||||
if (test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {
|
if (test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {
|
||||||
IWL_ERR(mvm, "Skip fw error dump since bus is dead\n");
|
IWL_ERR(mvm, "Skip fw error dump since bus is dead\n");
|
||||||
return;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mvm->fw_dump_trig &&
|
if (mvm->fw_dump_trig &&
|
||||||
|
@ -450,7 +449,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
|
||||||
|
|
||||||
fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);
|
fw_error_dump = kzalloc(sizeof(*fw_error_dump), GFP_KERNEL);
|
||||||
if (!fw_error_dump)
|
if (!fw_error_dump)
|
||||||
return;
|
goto out;
|
||||||
|
|
||||||
/* SRAM - include stack CCM if driver knows the values for it */
|
/* SRAM - include stack CCM if driver knows the values for it */
|
||||||
if (!mvm->cfg->dccm_offset || !mvm->cfg->dccm_len) {
|
if (!mvm->cfg->dccm_offset || !mvm->cfg->dccm_len) {
|
||||||
|
@ -550,8 +549,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
|
||||||
dump_file = vzalloc(file_len);
|
dump_file = vzalloc(file_len);
|
||||||
if (!dump_file) {
|
if (!dump_file) {
|
||||||
kfree(fw_error_dump);
|
kfree(fw_error_dump);
|
||||||
iwl_mvm_free_fw_dump_desc(mvm);
|
goto out;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fw_error_dump->op_mode_ptr = dump_file;
|
fw_error_dump->op_mode_ptr = dump_file;
|
||||||
|
@ -590,8 +588,6 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
|
||||||
memcpy(dump_trig, &mvm->fw_dump_desc->trig_desc,
|
memcpy(dump_trig, &mvm->fw_dump_desc->trig_desc,
|
||||||
sizeof(*dump_trig) + mvm->fw_dump_desc->len);
|
sizeof(*dump_trig) + mvm->fw_dump_desc->len);
|
||||||
|
|
||||||
/* now we can free this copy */
|
|
||||||
iwl_mvm_free_fw_dump_desc(mvm);
|
|
||||||
dump_data = iwl_fw_error_next_data(dump_data);
|
dump_data = iwl_fw_error_next_data(dump_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -677,6 +673,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
|
||||||
dev_coredumpm(mvm->trans->dev, THIS_MODULE, fw_error_dump, 0,
|
dev_coredumpm(mvm->trans->dev, THIS_MODULE, fw_error_dump, 0,
|
||||||
GFP_KERNEL, iwl_mvm_read_coredump, iwl_mvm_free_coredump);
|
GFP_KERNEL, iwl_mvm_read_coredump, iwl_mvm_free_coredump);
|
||||||
|
|
||||||
|
out:
|
||||||
|
iwl_mvm_free_fw_dump_desc(mvm);
|
||||||
mvm->fw_dump_trig = NULL;
|
mvm->fw_dump_trig = NULL;
|
||||||
clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);
|
clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue