# \[PATCH\]\[next\] ath11k: fix memory leak of 'combinations'

- Subsystems: ATHEROS ATH GENERIC UTILITIES, QUALCOMM ATHEROS ATH11K WIRELESS DRIVER, THE REST
- Maintainers: Jeff Johnson, Linus Torvalds
- List: netdev
- 2 messages, 2 authors
- Page: https://ratatoskr.run/netdev/2020/10/6132292/t

## \[PATCH\]\[next\] ath11k: fix memory leak of 'combinations'

- From: Colin King \<hidden\>
- Date: 2020-10-06 17:42:34 
- Message: https://ratatoskr.run/netdev/2020/10/6132292.md

```text
From: Colin Ian King <redacted>

Currently the error return path when 'limits' fails to allocate
does not free the memory allocated for 'combinations'. Fix this
by adding a kfree before returning.

Addresses-Coverity: ("Resource leak")
Fixes: 2626c269702e ("ath11k: add interface_modes to hw_params")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/wireless/ath/ath11k/mac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 3f63a7bd6b59..7f8dd47d2333 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6041,8 +6041,10 @@ static int ath11k_mac_setup_iface_combinations(struct ath11k *ar)
 	n_limits = 2;
 
 	limits = kcalloc(n_limits, sizeof(*limits), GFP_KERNEL);
-	if (!limits)
+	if (!limits) {
+		kfree(combinations);
 		return -ENOMEM;
+	}
 
 	limits[0].max = 1;
 	limits[0].types |= BIT(NL80211_IFTYPE_STATION);
-- 
2.27.0

```

## Re: \[PATCH\]\[next\] ath11k: fix memory leak of 'combinations'

- From: Kalle Valo \<hidden\>
- Date: 2020-10-08 10:52:49 
- Message: https://ratatoskr.run/netdev/2020/10/6133994.md

```text
Colin King [ref] wrote:

> From: Colin Ian King <redacted>
> 
> Currently the error return path when 'limits' fails to allocate
> does not free the memory allocated for 'combinations'. Fix this
> by adding a kfree before returning.
> 
> Addresses-Coverity: ("Resource leak")
> Fixes: 2626c269702e ("ath11k: add interface_modes to hw_params")
> Signed-off-by: Colin Ian King <redacted>

Alex already sent an identical patch:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=8431350eee2e27ae60f5250e0437ab298329070e

Patch set to Superseded.

-- 
https://patchwork.kernel.org/patch/11819025/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

```