Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 182b4310 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

iwlwifi: pcie: fix context info memory leak 



[ Upstream commit 2d6bc752cc2806366d9a4fd577b3f6c1f7a7e04e ]

If the image loader allocation fails, we leak all the previously
allocated memory. Fix this.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210115130252.97172cbaa67c.I3473233d0ad01a71aa9400832fb2b9f494d88a11@changeid


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 896cf561

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

+9 −2
Original line number Diff line number Diff line
@@ -159,8 +159,10 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	/* Allocate IML */

	iml_img = dma_alloc_coherent(trans->dev, trans->iml_len,

				     &trans_pcie->iml_dma_addr, GFP_KERNEL);

	if (!iml_img)

		return -ENOMEM;

	if (!iml_img) {

		ret = -ENOMEM;

		goto err_free_ctxt_info;

	}



	memcpy(iml_img, trans->iml, trans->iml_len);
@@ -177,6 +179,11 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 


	return 0;



err_free_ctxt_info:

	dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_gen3),

			  trans_pcie->ctxt_info_gen3,

			  trans_pcie->ctxt_info_dma_addr);

	trans_pcie->ctxt_info_gen3 = NULL;

err_free_prph_info:

	dma_free_coherent(trans->dev,

			  sizeof(*prph_info),