lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 132/563] staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit e730cd57ac2dfe94bca0f14a3be8e1b21de41a9c ]

    Some variables are leaked in the error handling in alloc_rtllib(), free
    the variables in the error path.

    Fixes: 94a799425eee ("From: wlanfae <wlanfae@realtek.com>")
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Pavel Skripkin <paskripkin@gmail.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20211202030704.2425621-3-yangyingliang@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8192e/rtllib_module.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
    index 64d9feee1f392..f00ac94b2639b 100644
    --- a/drivers/staging/rtl8192e/rtllib_module.c
    +++ b/drivers/staging/rtl8192e/rtllib_module.c
    @@ -88,7 +88,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
    err = rtllib_networks_allocate(ieee);
    if (err) {
    pr_err("Unable to allocate beacon storage: %d\n", err);
    - goto failed;
    + goto free_netdev;
    }
    rtllib_networks_initialize(ieee);

    @@ -121,11 +121,13 @@ struct net_device *alloc_rtllib(int sizeof_priv)
    ieee->hwsec_active = 0;

    memset(ieee->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
    - rtllib_softmac_init(ieee);
    + err = rtllib_softmac_init(ieee);
    + if (err)
    + goto free_crypt_info;

    ieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);
    if (!ieee->pHTInfo)
    - return NULL;
    + goto free_softmac;

    HTUpdateDefaultSetting(ieee);
    HTInitializeHTInfo(ieee);
    @@ -141,8 +143,14 @@ struct net_device *alloc_rtllib(int sizeof_priv)

    return dev;

    - failed:
    +free_softmac:
    + rtllib_softmac_free(ieee);
    +free_crypt_info:
    + lib80211_crypt_info_free(&ieee->crypt_info);
    + rtllib_networks_free(ieee);
    +free_netdev:
    free_netdev(dev);
    +
    return NULL;
    }
    EXPORT_SYMBOL(alloc_rtllib);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:11    [W:3.713 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site