lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 026/542] brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    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 7ba9f6a686459..1f5deea5a288e 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.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:23    [W:2.673 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site