From nobody Wed Apr 8 12:36:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CDFDECAAA1 for ; Fri, 9 Sep 2022 11:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230171AbiIIL16 (ORCPT ); Fri, 9 Sep 2022 07:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbiIIL1z (ORCPT ); Fri, 9 Sep 2022 07:27:55 -0400 X-Greylist: delayed 100478 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 09 Sep 2022 04:27:53 PDT Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84C6112F20E for ; Fri, 9 Sep 2022 04:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1662722871; bh=2y+E7kwgOLvUCg8rZ1hu5N2W5Q7xogjD9EgNDXRSFgQ=; h=From:To:Cc:Subject:Date; b=maowJbkYaU/OLMUDwdsaJqko1eyHym2/qi3R+vQf/yTgdyrxivoHcB1+m6dfO2tKR P5k82tMrGFnpbZV7iHVDNT+xm2LLB7Djd5KoE6Dr88FpinRW78yP4cHnrzneHi/PKt DrH4AvESg1Imt1g0PTj+GwJ8UGL/zbpkQ8iJDTSc= Received: from localhost.localdomain ([59.172.176.188]) by newxmesmtplogicsvrsza31.qq.com (NewEsmtp) with SMTP id 6F02267D; Fri, 09 Sep 2022 19:27:48 +0800 X-QQ-mid: xmsmtpt1662722868t7cygl1kz Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAjyTeMrtXPTfR8bd40mbNu/dfdSaPxtBQ7PuE3t15CErBk3S5klq WwXGkl6UnqT2pia9oUpAt8Ivo0P64Pdr3YyYkUQH4MZO/VN2XKSStOz6PiChI7eBu1ozqF3oGpw1 +y19JPK2s4FPKg67gCwxSTP3LOrjzKXu+k1hdzN7Su7cAxv5NnMkJQaltlFdmeQoV3f9hmFwxApm IOg5b6TRs55JlY/G6fWgtNNPFKol669lSQtSYOP0YrZmePE+JVbuQRV31Sn8W1FwdvzoCw5bzgi/ 7RhaV2KxyrpROBJwvL+lfxgOXyO/TTt1/pQHd7LXOvuoMAEAHcFISXBKGy13mCgE1hopzQ2WhKav AIZiROfvzGAnn3rqtjR25/7aLc0E4/SZu+shoTllgo4IdIGaizKPwjamSHGK/PeQTlnl0v3GW18x BSpdeTxfmvEmVgPXOoqsBlFivaWeZlL9BHyRDHS8mpYrnaJE+FxUpaQ009j8/HTQNet2u7JUuKdp WkziXmmjGB0QcnSC8rQZAaJpSu6oBzM2HGI+c8xfnvrs3BSvUIP9uskBe0LdAknA8AqxygLGYtAx ad7jns4IddTI16KK0HhpnTFAChaqNdZU86ChJFXGm/9hDSKvrv/UdhklScBGuf3tb75Pi9KWbfEg vImUkFrcUw5g54sKgi3Cq0eYlODgpvj3Guv4RcGl7y+byMqorgosTndsZzV+m5U2AEtWLQ72Iraz 0FE2+8CUYOrKhxqG2xi1W5zXfr2WmKAAHUi9KPcJ69q/dgRGBTIPI0gSC5aaPj/fsMyhJBYhjIfM tFgi2vgiGQmlpmJ8pZjDPnrp9w3FNRF0ZVln3KW2yGuqudmvr5v/Zc4MQ/g4IrGSK/FE9Ks70dA5 mTnDKROXM6QbZFmxKIpY50iSZFuK2o+3Bz2nTjM9NU2HyWGatW7qJfShi1f66RKSTHEn0XHOrVp+ UtO0/aG8QwkqZs15QfwSeb0qiBX4feOFbQx6rTEkMnzROwIIVPxRg6A18dVRfjbsLj7pOqVrtcF9 2GV3c0lA== From: xkernel.wang@foxmail.com To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Xiaoke Wang Subject: [PATCH v4] staging: rtl8723bs: fix a potential memory leak in rtw_init_cmd_priv() Date: Fri, 9 Sep 2022 19:27:21 +0800 X-OQ-MSGID: <20220909112721.3571-1-xkernel.wang@foxmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Xiaoke Wang 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 --- ChangeLog: v1->v2 update the description. v2->v3 update the description. v3->v4 remove trailing whitespace and restore unnecessary changes. 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/rtl= 8723bs/core/rtw_cmd.c index e909dcc..bd51233 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[] =3D { =20 int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { - int res =3D 0; - init_completion(&pcmdpriv->cmd_queue_comp); init_completion(&pcmdpriv->terminate_cmdthread_comp); =20 @@ -175,18 +173,16 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) =20 pcmdpriv->cmd_allocated_buf =3D rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ); =20 - if (!pcmdpriv->cmd_allocated_buf) { - res =3D -ENOMEM; - goto exit; - } + if (!pcmdpriv->cmd_allocated_buf) + return -ENOMEM; =20 pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - = ((SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1)); =20 pcmdpriv->rsp_allocated_buf =3D rtw_zmalloc(MAX_RSPSZ + 4); =20 if (!pcmdpriv->rsp_allocated_buf) { - res =3D -ENOMEM; - goto exit; + kfree(pcmdpriv->cmd_allocated_buf); + return -ENOMEM; } =20 pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcm= dpriv->rsp_allocated_buf) & 3); @@ -196,8 +192,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->rsp_cnt =3D 0; =20 mutex_init(&pcmdpriv->sctx_mutex); -exit: - return res; + + return 0; } =20 static void c2h_wk_callback(struct work_struct *work); --