* [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach'
@ 2017-06-20 6:22 Christophe JAILLET
2017-06-20 6:33 ` Kalle Valo
2017-06-20 19:53 ` Arend van Spriel
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2017-06-20 6:22 UTC (permalink / raw)
To: arend.vanspriel, franky.lin, hante.meuleman, kvalo, rafal,
pieter-paul.giesberts
Cc: linux-wireless, brcm80211-dev-list.pdl, netdev, linux-kernel,
kernel-janitors, Christophe JAILLET
If 'wiphy_new()' fails, we leak 'ops'. Add a new label in the error
handling path to free it in such a case.
Fixes: 5c22fb85102a7 ("brcmfmac: add wowl gtk rekeying offload support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 2443c71a202f..032d823c53c2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6861,7 +6861,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
wiphy = wiphy_new(ops, sizeof(struct brcmf_cfg80211_info));
if (!wiphy) {
brcmf_err("Could not allocate wiphy device\n");
- return NULL;
+ goto ops_out;
}
memcpy(wiphy->perm_addr, drvr->mac, ETH_ALEN);
set_wiphy_dev(wiphy, busdev);
@@ -7012,6 +7012,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
ifp->vif = NULL;
wiphy_out:
brcmf_free_wiphy(wiphy);
+ops_out:
kfree(ops);
return NULL;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach'
2017-06-20 6:22 [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Christophe JAILLET
@ 2017-06-20 6:33 ` Kalle Valo
2017-06-20 19:53 ` Arend van Spriel
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2017-06-20 6:33 UTC (permalink / raw)
To: Christophe JAILLET
Cc: arend.vanspriel, franky.lin, hante.meuleman, rafal,
pieter-paul.giesberts, linux-wireless, brcm80211-dev-list.pdl,
netdev, linux-kernel, kernel-janitors
Christophe JAILLET <christophe.jaillet@wanadoo.fr> writes:
> If 'wiphy_new()' fails, we leak 'ops'. Add a new label in the error
> handling path to free it in such a case.
>
> Fixes: 5c22fb85102a7 ("brcmfmac: add wowl gtk rekeying offload support")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
The prefix should be "brcmfmac:", like in the commit you are fixing.
"cfg80211:" is very misleading.
--
Kalle Valo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach'
2017-06-20 6:22 [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Christophe JAILLET
2017-06-20 6:33 ` Kalle Valo
@ 2017-06-20 19:53 ` Arend van Spriel
1 sibling, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2017-06-20 19:53 UTC (permalink / raw)
To: Christophe JAILLET, franky.lin, hante.meuleman, kvalo, rafal,
pieter-paul.giesberts
Cc: linux-wireless, brcm80211-dev-list.pdl, netdev, linux-kernel,
kernel-janitors
On 20-06-17 08:22, Christophe JAILLET wrote:
> If 'wiphy_new()' fails, we leak 'ops'. Add a new label in the error
> handling path to free it in such a case.
Thanks. Please add the following tags:
Cc: stable@vger.kernel.org
> Fixes: 5c22fb85102a7 ("brcmfmac: add wowl gtk rekeying offload support")
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-20 19:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-20 6:22 [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Christophe JAILLET
2017-06-20 6:33 ` Kalle Valo
2017-06-20 19:53 ` Arend van Spriel
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).