lkml.org 
[lkml]   [2017]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 24/84] brcmfmac: Fix a memory leak in error handling path in brcmf_cfg80211_attach
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>

    commit 57c00f2fac512837f8de73474ec1f54020015bae upstream.

    If 'wiphy_new()' fails, we leak 'ops'. Add a new label in the error
    handling path to free it in such a case.

    Fixes: 5c22fb85102a7 ("brcmfmac: add wowl gtk rekeying offload support")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    @@ -6855,7 +6855,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
    wiphy = wiphy_new(ops, sizeof(struct brcmf_cfg80211_info));
    if (!wiphy) {
    brcmf_err("Could not allocate wiphy device\n");
    - return NULL;
    + goto ops_out;
    }
    memcpy(wiphy->perm_addr, drvr->mac, ETH_ALEN);
    set_wiphy_dev(wiphy, busdev);
    @@ -6998,6 +6998,7 @@ priv_out:
    ifp->vif = NULL;
    wiphy_out:
    brcmf_free_wiphy(wiphy);
    +ops_out:
    kfree(ops);
    return NULL;
    }

    \
     
     \ /
      Last update: 2017-07-19 12:02    [W:4.286 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site