* [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
@ 2019-11-22 19:19 Navid Emamdoost
2019-12-18 18:21 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Navid Emamdoost @ 2019-11-22 19:19 UTC (permalink / raw)
To: Arend van Spriel, Franky Lin, Hante Meuleman, Chi-Hsien Lin,
Wright Feng, Kalle Valo, David S. Miller, Navid Emamdoost,
Rafał Miłecki, Pieter-Paul Giesberts, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list, netdev, linux-kernel
Cc: emamd001
In the implementation of brcmf_p2p_create_p2pdev() the allocated memory
for p2p_vif is leaked when the mac address is the same as primary
interface. To fix this, go to error path to release p2p_vif via
brcmf_free_vif().
Fixes: cb746e47837a ("brcmfmac: check p2pdev mac address uniqueness")
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 7ba9f6a68645..1f5deea5a288 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -2092,7 +2092,8 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
/* firmware requires unique mac address for p2pdev interface */
if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {
bphy_err(drvr, "discovery vif must be different from primary interface\n");
- return ERR_PTR(-EINVAL);
+ err = -EINVAL;
+ goto fail;
}
brcmf_p2p_generate_bss_mac(p2p, addr);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
2019-11-22 19:19 [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() Navid Emamdoost
@ 2019-12-18 18:21 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2019-12-18 18:21 UTC (permalink / raw)
To: Navid Emamdoost
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Chi-Hsien Lin,
Wright Feng, David S. Miller, Navid Emamdoost,
Rafał Miłecki, Pieter-Paul Giesberts, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list, netdev, linux-kernel,
emamd001
Navid Emamdoost <navid.emamdoost@gmail.com> wrote:
> In the implementation of brcmf_p2p_create_p2pdev() the allocated memory
> for p2p_vif is leaked when the mac address is the same as primary
> interface. To fix this, go to error path to release p2p_vif via
> brcmf_free_vif().
>
> Fixes: cb746e47837a ("brcmfmac: check p2pdev mac address uniqueness")
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Patch applied to wireless-drivers-next.git, thanks.
5cc509aa83c6 brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
--
https://patchwork.kernel.org/patch/11258373/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-18 18:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-22 19:19 [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() Navid Emamdoost
2019-12-18 18:21 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).