Commit a571bc28 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo
Browse files

iwlwifi: Fix memory leaks in error handling path 



Should an error occur (invalid TLV len or memory allocation failure), the
memory already allocated in 'reduce_power_data' should be freed before
returning, otherwise it is leaking.

Fixes: 9dad325f ("iwlwifi: support loading the reduced power table from UEFI")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1504cd7d842d13ddb8244e18004523128d5c9523.1636615284.git.christophe.jaillet@wanadoo.fr
parent f5cecf1d

drivers/net/wireless/intel/iwlwifi/fw/uefi.c

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
		if (len < tlv_len) {

			IWL_ERR(trans, "invalid TLV len: %zd/%u\n",

				len, tlv_len);

			kfree(reduce_power_data);

			reduce_power_data = ERR_PTR(-EINVAL);

			goto out;

		}
@@ -105,6 +106,7 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
				IWL_DEBUG_FW(trans,

					     "Couldn't allocate (more) reduce_power_data\n");



				kfree(reduce_power_data);

				reduce_power_data = ERR_PTR(-ENOMEM);

				goto out;

			}
@@ -134,6 +136,10 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
done:

	if (!size) {

		IWL_DEBUG_FW(trans, "Empty REDUCE_POWER, skipping.\n");

		/* Better safe than sorry, but 'reduce_power_data' should

		 * always be NULL if !size.

		 */

		kfree(reduce_power_data);

		reduce_power_data = ERR_PTR(-ENOENT);

		goto out;

	}