| Message ID | 20201004100218.311653-2-alex.dewar90@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8431350eee2e27ae60f5250e0437ab298329070e |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [1/2] ath11k: Fix memory leak on error path | expand |
Alex Dewar <alex.dewar90@gmail.com> wrote: > In ath11k_mac_setup_iface_combinations(), if memory cannot be assigned > for the variable limits, then the memory assigned to combinations will > be leaked. Fix this. > > Addresses-Coverity-ID: 1497534 ("Resource leaks") > Fixes: 2626c269702e ("ath11k: add interface_modes to hw_params") > Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> Patch applied to wireless-drivers-next.git, thanks. 8431350eee2e ath11k: Fix memory leak on error path
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);
In ath11k_mac_setup_iface_combinations(), if memory cannot be assigned for the variable limits, then the memory assigned to combinations will be leaked. Fix this. Addresses-Coverity-ID: 1497534 ("Resource leaks") Fixes: 2626c269702e ("ath11k: add interface_modes to hw_params") Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> --- drivers/net/wireless/ath/ath11k/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)