* [PATCH][next] ath11k: fix memory leak on reg_info
@ 2019-12-12 18:32 Colin King
2019-12-18 17:52 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-12-12 18:32 UTC (permalink / raw)
To: Kalle Valo, David S . Miller, Pradeep Kumar Chitrapu,
Ganesh Sesetti, Karthikeyan Periyasamy, John Crispin, ath11k,
linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently a return path is leaking the previously allocate reg_info. Fix
this by exiting via the return path mem_free. Since the return value ret
is defaulted to 0, there is no need to re-assign ret to the 0 before
the goto.
Addresses-Coverity: ("Resource leak")
Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/ath/ath11k/wmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index b05642617b78..acb1c03d4f70 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -4522,7 +4522,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab, struct sk_buff *sk
if (ab->default_regd[pdev_idx] && !ab->new_regd[pdev_idx] &&
!memcmp((char *)ab->default_regd[pdev_idx]->alpha2,
(char *)reg_info->alpha2, 2))
- return 0;
+ goto mem_free;
/* Intersect new rules with default regd if a new country setting was
* requested, i.e a default regd was already set during initialization
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] ath11k: fix memory leak on reg_info
2019-12-12 18:32 [PATCH][next] ath11k: fix memory leak on reg_info Colin King
@ 2019-12-18 17:52 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2019-12-18 17:52 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Pradeep Kumar Chitrapu, Ganesh Sesetti,
Karthikeyan Periyasamy, John Crispin, ath11k, linux-wireless,
netdev, kernel-janitors, linux-kernel
Colin King <colin.king@canonical.com> wrote:
> Currently a return path is leaking the previously allocate reg_info. Fix
> this by exiting via the return path mem_free. Since the return value ret
> is defaulted to 0, there is no need to re-assign ret to the 0 before
> the goto.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
b5316db229d5 ath11k: fix memory leak on reg_info
--
https://patchwork.kernel.org/patch/11289073/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-18 17:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-12 18:32 [PATCH][next] ath11k: fix memory leak on reg_info Colin King
2019-12-18 17:52 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).