From: Christophe Jaillet Date: Wed, 21 Jun 2017 05:45:53 +0000 (+0200) Subject: brcmfmac: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' X-Git-Tag: MMI-PSA29.97-13-9~5285^2~16^2~28 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57c00f2fac512837f8de73474ec1f54020015bae;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git brcmfmac: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach' If 'wiphy_new()' fails, we leak 'ops'. Add a new label in the error handling path to free it in such a case. Cc: stable@vger.kernel.org Fixes: 5c22fb85102a7 ("brcmfmac: add wowl gtk rekeying offload support") Signed-off-by: Christophe JAILLET Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 63e7683a80dd..898c7b024c15 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -6862,7 +6862,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); @@ -7013,6 +7013,7 @@ priv_out: ifp->vif = NULL; wiphy_out: brcmf_free_wiphy(wiphy); +ops_out: kfree(ops); return NULL; }