Commit e90376e3 authored by Xiaoke Wang's avatar Xiaoke Wang Committed by Jialin Zhang
Browse files

staging: rtl8723bs: fix a potential memory leak in rtw_init_cmd_priv() 

stable inclusion
from stable-v5.10.150
commit e6cc39db24a63f68314473621020ed8cad7be423
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0XA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e6cc39db24a63f68314473621020ed8cad7be423



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

[ Upstream commit 708056fb ]

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: default avatarXiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_2B7931B79BA38E22205C5A09EFDF11E48805@qq.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent cdf91789

drivers/staging/rtl8723bs/core/rtw_cmd.c

+6 −10
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ No irqsave is necessary. 


int rtw_init_cmd_priv(struct	cmd_priv *pcmdpriv)

{

	int res = 0;



	init_completion(&pcmdpriv->cmd_queue_comp);

	init_completion(&pcmdpriv->terminate_cmdthread_comp);
@@ -178,18 +176,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);
@@ -199,8 +195,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(_workitem * work);