lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 825/862] staging: rtl8723bs: fix a potential memory leak in rtw_init_cmd_priv()
    Date
    From: Xiaoke Wang <xkernel.wang@foxmail.com>

    [ Upstream commit 708056fba733a73d926772ea4ce9a42d240345da ]

    In rtw_init_cmd_priv(), if `pcmdpriv->rsp_allocated_buf` is allocated
    in failure, then `pcmdpriv->cmd_allocated_buf` will be not properly
    released. Besides, considering there are only two error paths and the
    first one can directly return, so we do not need implicitly jump to the
    `exit` tag to execute the error handler.

    So this patch added `kfree(pcmdpriv->cmd_allocated_buf);` on the error
    path to release the resource and simplified the return logic of
    rtw_init_cmd_priv(). As there is no proper device to test with, no runtime
    testing was performed.

    Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
    Link: https://lore.kernel.org/r/tencent_2B7931B79BA38E22205C5A09EFDF11E48805@qq.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8723bs/core/rtw_cmd.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
    index b4170f64d118..03c2c66dbf66 100644
    --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
    +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
    @@ -161,8 +161,6 @@ static struct cmd_hdl wlancmds[] = {

    int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
    {
    - int res = 0;
    -
    init_completion(&pcmdpriv->cmd_queue_comp);
    init_completion(&pcmdpriv->terminate_cmdthread_comp);

    @@ -175,18 +173,16 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

    pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ);

    - if (!pcmdpriv->cmd_allocated_buf) {
    - res = -ENOMEM;
    - goto exit;
    - }
    + if (!pcmdpriv->cmd_allocated_buf)
    + return -ENOMEM;

    pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1));

    pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4);

    if (!pcmdpriv->rsp_allocated_buf) {
    - res = -ENOMEM;
    - goto exit;
    + kfree(pcmdpriv->cmd_allocated_buf);
    + return -ENOMEM;
    }

    pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
    @@ -196,8 +192,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
    pcmdpriv->rsp_cnt = 0;

    mutex_init(&pcmdpriv->sctx_mutex);
    -exit:
    - return res;
    +
    + return 0;
    }

    static void c2h_wk_callback(struct work_struct *work);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:05    [W:3.701 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site