110-v5.6-brcmfmac-Fix-memory-leak-in-brcmf_p2p_create_p2pdev.patch 1.2 KB

1234567891011121314151617181920212223242526272829
  1. From 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 Mon Sep 17 00:00:00 2001
  2. From: Navid Emamdoost <[email protected]>
  3. Date: Fri, 22 Nov 2019 13:19:48 -0600
  4. Subject: [PATCH] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
  5. In the implementation of brcmf_p2p_create_p2pdev() the allocated memory
  6. for p2p_vif is leaked when the mac address is the same as primary
  7. interface. To fix this, go to error path to release p2p_vif via
  8. brcmf_free_vif().
  9. Fixes: cb746e47837a ("brcmfmac: check p2pdev mac address uniqueness")
  10. Signed-off-by: Navid Emamdoost <[email protected]>
  11. Signed-off-by: Kalle Valo <[email protected]>
  12. ---
  13. drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 ++-
  14. 1 file changed, 2 insertions(+), 1 deletion(-)
  15. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  16. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  17. @@ -2092,7 +2092,8 @@ static struct wireless_dev *brcmf_p2p_cr
  18. /* firmware requires unique mac address for p2pdev interface */
  19. if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {
  20. bphy_err(drvr, "discovery vif must be different from primary interface\n");
  21. - return ERR_PTR(-EINVAL);
  22. + err = -EINVAL;
  23. + goto fail;
  24. }
  25. brcmf_p2p_generate_bss_mac(p2p, addr);