Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1670325 > unrolled thread
| Started by | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| First post | 2017-06-20 08:30 +0200 |
| Last post | 2017-06-20 22:00 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-06-20 08:30 +0200
Re: [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Kalle Valo <kvalo@codeaurora.org> - 2017-06-20 08:40 +0200
Re: [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' Arend van Spriel <arend.vanspriel@broadcom.com> - 2017-06-20 22:00 +0200
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2017-06-20 08:30 +0200 |
| Subject | [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' |
| Message-ID | <tUkPM-4Yr-13@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Kalle Valo <kvalo@codeaurora.org> |
|---|---|
| Date | 2017-06-20 08:40 +0200 |
| Message-ID | <tUkZr-51E-3@gated-at.bofh.it> |
| In reply to | #1670325 |
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
[toc] | [prev] | [next] | [standalone]
| From | Arend van Spriel <arend.vanspriel@broadcom.com> |
|---|---|
| Date | 2017-06-20 22:00 +0200 |
| Subject | Re: [PATCH] cfg80211: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' |
| Message-ID | <tUxtE-4rk-13@gated-at.bofh.it> |
| In reply to | #1670325 |
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(-)
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web