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

Commit cb853da3 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: fix memory leak in brcmf_cfg80211_attach() 



In brcmf_cfg80211_attach() there was one error path not properly
handled as it leaked memory allocated in brcmf_btcoex_attach().

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ad688cdb

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

+5 −2
Original line number Diff line number Diff line
@@ -6868,7 +6868,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, 


	err = brcmf_p2p_attach(cfg, p2pdev_forced);

	if (err) {

		brcmf_err("P2P initilisation failed (%d)\n", err);

		brcmf_err("P2P initialisation failed (%d)\n", err);

		goto wiphy_unreg_out;

	}

	err = brcmf_btcoex_attach(cfg);
@@ -6893,7 +6893,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, 
	err = brcmf_fweh_activate_events(ifp);

	if (err) {

		brcmf_err("FWEH activation failed (%d)\n", err);

		goto wiphy_unreg_out;

		goto detach;

	}



	/* Fill in some of the advertised nl80211 supported features */
@@ -6908,6 +6908,9 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, 


	return cfg;



detach:

	brcmf_btcoex_detach(cfg);

	brcmf_p2p_detach(&cfg->p2p);

wiphy_unreg_out:

	wiphy_unregister(cfg->wiphy);

priv_out: