From nobody Tue Jun 23 06:21:23 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 58B1DC433EF for ; Wed, 9 Mar 2022 20:51:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238219AbiCIUwN (ORCPT ); Wed, 9 Mar 2022 15:52:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238253AbiCIUwH (ORCPT ); Wed, 9 Mar 2022 15:52:07 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1C079D06E for ; Wed, 9 Mar 2022 12:51:05 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id k5-20020a17090a3cc500b001befa0d3102so4793993pjd.1 for ; Wed, 09 Mar 2022 12:51:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7ahohIKmaArLsCJPY4+ge/uAdlyV8nk9IujiHAfW4A=; b=dmx141/GaSwrAzPKb7RZU3g4+h4hKWDiNc1E0s+U+jcE0N6ksCS04dQ4rlmPxIO/5V dhPm7Ko+x7UwH1dbWIS3/MQ4bjp3VSbbLXLcrtlqzK4oDVRS17inl4YICiXfqhtEogkz HNyqE8epSgs4VOc7m94SD+Nt5Z355lfRy37SmyRP4vD9NlQ0ydqFOtUpzS9cbPfkfrP5 2BZs2OagDmRI3Z6UKxlcanEozUTh1NFL5a/ZrUoP+4coOECMJpriRgak2n6dGbyEj8+5 zl+RcctSjyCRXP4ghxcdqRV2v/KIUSuwk/QyH2JrMf9ZZHAOWmOPnpvD9Kh82Uezbjtr JcXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7ahohIKmaArLsCJPY4+ge/uAdlyV8nk9IujiHAfW4A=; b=oq4w+o8Bl0gDSfESOGxp/4S5E1e9D2INPPhk19NND2/GF1tl/Kwb28FOY4k5yYbP+E pVYKa1TpR1WA7WDPEr0eZt1T91fKAAsYGv/QQbI7udg46tskTKUu067qyNOAlILUDNmG AbCoFizFsRCZP9SX+VOpmsGWAxmwrqfCuvUmvgnF1X1G0y4VsvlrGYhFOshGxqremOKx shxRRX3+qv6dyzm/GuGMMlusdH1KJTGYOTUJT5YtU2Y+5Vtjmw5mp9maK6oVvR3BW3Q1 MAp2Yv88O5FlSjVep8Zb52I0McM1/i1MEIixFJms9vXJEHoxtPQaWL1o4LcKVRDU23cY nECA== X-Gm-Message-State: AOAM530bSZtrwE+TlUfguGPn5gw8yp14FI1S/kqW0wJnnSyXkWagWn25 xmiwtTX8ij9h1MyQ6FEVf9s= X-Google-Smtp-Source: ABdhPJxNHGW2frv7Ctlan/UqdkPA6LgkKpiJhjlVqQ3Iu2VvRAVjHopVA8TeYtmM1J3GzY23ya9lHQ== X-Received: by 2002:a17:902:f549:b0:151:fd3b:247 with SMTP id h9-20020a170902f54900b00151fd3b0247mr1389320plf.11.1646859065371; Wed, 09 Mar 2022 12:51:05 -0800 (PST) Received: from localhost.localdomain ([103.85.9.4]) by smtp.gmail.com with ESMTPSA id m11-20020a17090a3f8b00b001bc299e0aefsm7259674pjc.56.2022.03.09.12.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 12:51:05 -0800 (PST) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube , Martin Kaiser , Dan Carpenter , Pavel Skripkin Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Vihas Makwana Subject: [PATCH v2 1/2] staging: r8188eu: call _cancel_timer_ex from _rtw_free_recv_priv Date: Thu, 10 Mar 2022 02:20:46 +0530 Message-Id: <20220309205047.45981-2-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309205047.45981-1-makvihas@gmail.com> References: <20220309205047.45981-1-makvihas@gmail.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" The _rtw_init_recv_priv() initializes precvpriv->signal_stat_timer and sets it's timeout interval to 1000 ms. But _rtw_free_recv_priv() doesn't cancel the timer and we need to explicitly call _cancel_timer_ex() after we call _rtw_free_recv_priv() to cancel the timer. Call _cancel_timer_ex() from inside _rtw_free_recv_priv() as every init function needs a matching free function. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_recv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index d77d98351..61308eb39 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -103,6 +103,7 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv) vfree(precvpriv->pallocated_frame_buf); =20 rtl8188eu_free_recv_priv(padapter); + _cancel_timer_ex(&precvpriv->signal_stat_timer); } =20 struct recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue) --=20 2.30.2 From nobody Tue Jun 23 06:21:23 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 4F58AC433EF for ; Wed, 9 Mar 2022 20:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238234AbiCIUwQ (ORCPT ); Wed, 9 Mar 2022 15:52:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238243AbiCIUwJ (ORCPT ); Wed, 9 Mar 2022 15:52:09 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 750039728B for ; Wed, 9 Mar 2022 12:51:09 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id g19so3294806pfc.9 for ; Wed, 09 Mar 2022 12:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PRuLGiKcgeniLC3aDTEnQaGDsSncDSNRKzBTC6T4h/U=; b=KWJul6uaiJTImsNot7Nu/MBSEElHc19LQWouzDAkOsKJHkjDIKBbmpfVgP9AQ1gkUO UwkOFXL1OpeFHsZWEanIFGUj3QGsseh+QD+BdrrudiYEzbWqWw55Ne2/eofJHTt8xLpx WpPjDC4SYm4ErM16Q1YBSENiwrR7xnrZeRZ7FYX1avb5KqKaiDUX96htk8iGcLUmT8Uc xL32SStiGnlRlxjDaM/97ntdEcVDVuspqvimDzvjF5HXd7hA9r+VDoDGIupXPgn7eRuS 5o02NB2c3IRezQ5wlPAua/zSaUr5ypc/hPb3YkzlD0r25q3lReHqzzSkdlDrnfjAZH+S 847Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PRuLGiKcgeniLC3aDTEnQaGDsSncDSNRKzBTC6T4h/U=; b=ljf0LaFjYu38F55I59vQIzSRstrVhDaGEUv71XGS/rFlj3cXDoKAQYxlqeDeaaYkDL /njqczitR+HQvBEaVy9eZgh9S9op1YMHAUsKrCtJJhNpoUXiBEJ8fTlLppJyelWhPveV omsb7ynN1drJRZadgd3/wEFJTl1IfodSMaiAt9tZVvrXmU3tjSNYPzuLWfakMXq5dFfm Jwd8pDpg83eQR5GFDQdCYryIuD5/4J9d96DEltCUfYQ+V1OxdnemtJSyI976e7XDONGh 1D5vPN8GIsYJmWxhBaDN1kiuEqadMEEJG5YfV4JtRS7UDANXDaQ5Lv4CThTCglDTRKne R/HA== X-Gm-Message-State: AOAM531sITQKI9VvGhmixdvQbW8tz+e1tugbHlX7wwpaAljFCiG4+TTO 24AMtYFfQBQvtvgHCxtLevQ= X-Google-Smtp-Source: ABdhPJxhKZ1SFC/gANrS86QFTadnD9Lns7/2sSdDa97GeaJXio+Ecxci3LautFmffvxq+3eGW9FCDw== X-Received: by 2002:a63:ce48:0:b0:373:ac94:f489 with SMTP id r8-20020a63ce48000000b00373ac94f489mr1293946pgi.622.1646859068956; Wed, 09 Mar 2022 12:51:08 -0800 (PST) Received: from localhost.localdomain ([103.85.9.4]) by smtp.gmail.com with ESMTPSA id m11-20020a17090a3f8b00b001bc299e0aefsm7259674pjc.56.2022.03.09.12.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 12:51:08 -0800 (PST) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube , Martin Kaiser , Dan Carpenter , Pavel Skripkin Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Vihas Makwana Subject: [PATCH v2 2/2] staging: r8188eu: proper error handling in rtw_init_drv_sw Date: Thu, 10 Mar 2022 02:20:47 +0530 Message-Id: <20220309205047.45981-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309205047.45981-1-makvihas@gmail.com> References: <20220309205047.45981-1-makvihas@gmail.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" The code inside rtw_init_drv_sw() calls various init functions to populate the padapter structure and checks for their return values respectively. But if one of the functions in middle fails then it simply returns _FAIL instead of proper logging and calling freeing counterparts of previous init functions. This leads to various memory leaks and can be found in /sys/kernel/debug/kmemleak if kernel is compiled with DEBUG_KMEMLEAK=3Dy. Fix this and keep the success and error separate. Fixes: 2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver") Reviewed-by: Dan Carpenter Reviewed-by: Pavel Skripkin Signed-off-by: Vihas Makwana --- Tested on Comfast CF-WU810N RTL8188EUS wireless adapter. --- drivers/staging/r8188eu/os_dep/os_intfs.c | 60 ++++++++++++++++++----- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 197568422..f59b23dc6 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -469,32 +469,46 @@ u8 rtw_reset_drv_sw(struct adapter *padapter) =20 u8 rtw_init_drv_sw(struct adapter *padapter) { - if ((rtw_init_cmd_priv(&padapter->cmdpriv)) =3D=3D _FAIL) + if ((rtw_init_cmd_priv(&padapter->cmdpriv)) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_cmd_priv failed\n"); return _FAIL; + } =20 padapter->cmdpriv.padapter =3D padapter; =20 - if ((rtw_init_evt_priv(&padapter->evtpriv)) =3D=3D _FAIL) - return _FAIL; + if ((rtw_init_evt_priv(&padapter->evtpriv)) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_evt_priv failed\n"); + goto free_cmd_priv; + } =20 - if (rtw_init_mlme_priv(padapter) =3D=3D _FAIL) - return _FAIL; + if (rtw_init_mlme_priv(padapter) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_mlme_priv failed\n"); + goto free_evt_priv; + } =20 rtw_init_wifidirect_timers(padapter); init_wifidirect_info(padapter, P2P_ROLE_DISABLE); reset_global_wifidirect_info(padapter); =20 - if (init_mlme_ext_priv(padapter) =3D=3D _FAIL) - return _FAIL; + if (init_mlme_ext_priv(padapter) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n"); + goto free_mlme_priv; + } =20 - if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) =3D=3D _FAIL) - return _FAIL; + if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n"); + goto free_mlme_ext; + } =20 - if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) =3D=3D _FAIL) - return _FAIL; + if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_recv_priv failed\n"); + goto free_xmit_priv; + } =20 - if (_rtw_init_sta_priv(&padapter->stapriv) =3D=3D _FAIL) - return _FAIL; + if (_rtw_init_sta_priv(&padapter->stapriv) =3D=3D _FAIL) { + dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_sta_priv failed\n"); + goto free_recv_priv; + } =20 padapter->stapriv.padapter =3D padapter; =20 @@ -510,6 +524,26 @@ u8 rtw_init_drv_sw(struct adapter *padapter) spin_lock_init(&padapter->br_ext_lock); =20 return _SUCCESS; + +free_recv_priv: + _rtw_free_recv_priv(&padapter->recvpriv); + +free_xmit_priv: + _rtw_free_xmit_priv(&padapter->xmitpriv); + +free_mlme_ext: + free_mlme_ext_priv(&padapter->mlmeextpriv); + +free_mlme_priv: + rtw_free_mlme_priv(&padapter->mlmepriv); + +free_evt_priv: + rtw_free_evt_priv(&padapter->evtpriv); + +free_cmd_priv: + rtw_free_cmd_priv(&padapter->cmdpriv); + + return _FAIL; } =20 void rtw_cancel_all_timer(struct adapter *padapter) --=20 2.30.2