Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c00f2f authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Kalle Valo
Browse files

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: 5c22fb85 ("brcmfmac: add wowl gtk rekeying offload support")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent dca2307e

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ 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;

}