iwlwifi: pcie: free context info in case of failures
authorJohannes Berg <johannes.berg@intel.com>
Wed, 19 Apr 2017 08:30:47 +0000 (10:30 +0200)
committerLuca Coelho <luciano.coelho@intel.com>
Thu, 20 Apr 2017 04:28:03 +0000 (07:28 +0300)
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: eda50cde58de ("iwlwifi: pcie: add context information support")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

index 854d618..1d95512 100644 (file)
@@ -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;