From nobody Mon Apr 6 09:42:45 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 3EDC7ECAAD5 for ; Thu, 8 Sep 2022 07:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230358AbiIHHkv (ORCPT ); Thu, 8 Sep 2022 03:40:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbiIHHkr (ORCPT ); Thu, 8 Sep 2022 03:40:47 -0400 Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88A5DA9C02 for ; Thu, 8 Sep 2022 00:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1662622834; bh=28ZeIHtLy4fSUpsw0G6PvyUZcFFeSa2cafIP6grxt64=; h=From:To:Cc:Subject:Date; b=Nsz05CGzbxf6wLw78S8E2AT6hJOhftKvo9R1+0b+/hdyUAMONyfs3DETRVw9zlNkV rg6dYgLHGmtwyPnSx4/VfzLL8bJ+O+4ViZnmt36nPYIx/1DPPwNEES5ByhP8GVtcCh E3x0Ac1V9AiytoiqYMZKmJ6BPr+pO4T31Aa/Ab9o= Received: from localhost.localdomain ([59.172.176.188]) by newxmesmtplogicsvrszc14.qq.com (NewEsmtp) with SMTP id 84B0E241; Thu, 08 Sep 2022 15:33:11 +0800 X-QQ-mid: xmsmtpt1662622391tawvm0z0s Message-ID: X-QQ-XMAILINFO: MB5+LsFw85NoAeIKrPV78jd1oTZa0S2N6aaxEvyM9cATQrj5Nfw2PZCm/2tmwa ETX/rIhhYYyN2WjF6VWVtAEFQH0+geX2zJnidAQyk0FndTuJZMM0JupL+ukHfK5fG2jiTJiY/Lr/ /wonX2VXy+MLqAjObqRVbrJYJ1rkQT5zs1vWWXzB0zbYKdnPbpIgA91Ij2gzAJSoldSBsB4msXf/ AOAtKDa7Bu1q4fSzWmuhgB3aNsgqu7e+irKPkggYPaX0rjVbdqokrMDoRRmF5QUqtjsO2Cck610/ rYz3xyvUkdC/hiJbCL7B/ZJFXUn9wGz4vYNMgVpNKKJMVaLXgZgdyLK3irb3G1/crAuSwtC5PsDf DrqdLtI+oAyLN9yp1whjWAqVk1lxaPOQlbMaACvn57g11f+1Zpi62oVncckDzHa3eJJ7p/FljKGD hSj278K9+w5UJTau97U/pmUExUNvaJ2QibQQE7ijxyPiYGeI+NpwMjY9CP8HJz2EFLlJinW4Z238 w60WUkStgPwcxVYxYplEDEYNdOVsxJmQTpUdrsbg7/hLJyQh6Zf06hhwHN/HEgi/EqQmPDcEJ63Y wXjwHSXm4L5b2om4P+TxCoYQz/aX4dmYMWtKhvNWwpk5yjs7TJZKLz0kfGA17gtfi7/pht6LNQ3g +XFLU+N8BIMVNR2tkuYnCHE1jpmLdb03lnbIkH2FGorciez6gh1oyNxlp7Eu1YqDDZ1m/LfhkNKG Bw0/jkbrQqBJP/kqqU8Oca8a8KOKCgudYDKfzKeQZGTiMAwCLqsByY2tgVNrAl+Voro4zRN4qppN esnlZ+NznuzJnrPoac7WQ2sydIYnYiRzA6cf6uEdV2tR6noZdNAKgdeH5La4GOAH+HarFQAde1LL 9arQ+kK+rU7GOwIaFVOvWIOOMPw0BwjpDUwhDC+D+rBa9fQhmXk/tYMA2pu4/LXfwD6Utsg/u/xa XLb7eqCeecueeR69Nqu8tew4BORL7zqrtx6Fjt3JuJRh3kImE16+0bLH5uQHzRXphqI9WiQFg= From: xkernel.wang@foxmail.com To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Xiaoke Wang Subject: [PATCH v3] staging: rtl8723bs: fix a potential memory leak in rtw_init_cmd_priv() Date: Thu, 8 Sep 2022 15:33:00 +0800 X-OQ-MSGID: <20220908073300.2253-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 =20 in failure, then `pcmdpriv->cmd_allocated_buf` will be not properly=20 released. Besides, considering there are only two error paths and the=20 first one can directly return, so we do not need implicitly jump to the=20 `exit` tag to execute the error handler. So this patch added `kfree(pcmdpriv->cmd_allocated_buf);` on the error=20 path to release the resource and simplified the return logic of=20 rtw_init_cmd_priv(). As there is no FooBar 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. drivers/staging/rtl8723bs/core/rtw_cmd.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index e574893..9126ea9 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,17 @@ 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); + pcmdpriv->cmd_allocated_buf =3D NULL; + return -ENOMEM; } =20 pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcm= dpriv->rsp_allocated_buf) & 3); @@ -196,8 +193,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); --