| From f24b003a1ce26dba810c8795af0da03260311aa9 Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Fri, 22 Nov 2019 13:19:48 -0600 |
| Subject: [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() |
| |
| commit 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 upstream. |
| |
| 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> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c |
| index 73a0e550f2b2..6e524de3d58c 100644 |
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c |
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c |
| @@ -2103,7 +2103,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.7.4 |
| |
