Commit 718ceb22 authored Apr 19, 2017 by Johannes Berg Committed by Luca Coelho Apr 20, 2017

iwlwifi: pcie: free context info in case of failures



If iwl_pcie_ctxt_info_init_fw_sec() fails, the previous allocated DMA
memory needs to be freed (it even goes out of scope immediately.)
Do that to prevent the leak.

Fixes: eda50cde ("iwlwifi: pcie: add context information support")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

parent 97b00d87

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -241,8 +241,11 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,

		/* allocate ucode sections in dram and set addresses */
		ret = iwl_pcie_ctxt_info_init_fw_sec(trans, fw, ctxt_info);
		if (ret)
		if (ret) {
		dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info),
		ctxt_info, trans_pcie->ctxt_info_dma_addr);
		return ret;
		}

		trans_pcie->ctxt_info = ctxt_info;