lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 378/408] brcmsmac: fix memory leak in wlc_phy_attach_lcnphy
    Date
    From: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>

    [ Upstream commit f4443293d741d1776b86ed1dd8c4e4285d0775fc ]

    When wlc_phy_txpwr_srom_read_lcnphy fails in wlc_phy_attach_lcnphy,
    the allocated pi->u.pi_lcnphy is leaked, since struct brcms_phy will be
    freed in the caller function.

    Fix this by calling wlc_phy_detach_lcnphy in the error handler of
    wlc_phy_txpwr_srom_read_lcnphy before returning.

    Signed-off-by: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20200908121743.23108-1-keitasuzuki.park@sslab.ics.keio.ac.jp
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
    index 7ef36234a25dc..66797dc5e90d5 100644
    --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
    @@ -5065,8 +5065,10 @@ bool wlc_phy_attach_lcnphy(struct brcms_phy *pi)
    pi->pi_fptr.radioloftget = wlc_lcnphy_get_radio_loft;
    pi->pi_fptr.detach = wlc_phy_detach_lcnphy;

    - if (!wlc_phy_txpwr_srom_read_lcnphy(pi))
    + if (!wlc_phy_txpwr_srom_read_lcnphy(pi)) {
    + kfree(pi->u.pi_lcnphy);
    return false;
    + }

    if (LCNREV_IS(pi->pubpi.phy_rev, 1)) {
    if (pi_lcn->lcnphy_tempsense_option == 3) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:57    [W:3.328 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site