You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 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()
|
|
|
|
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>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- 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_cr
|
|
/* 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);
|