| Message ID | 20170620062205.16078-1-christophe.jaillet@wanadoo.fr |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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.
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(-)
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; }
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(-)