From nobody Tue Jun 23 08:04:25 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 CB6C2C433F5 for ; Tue, 8 Mar 2022 20:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348290AbiCHU5e (ORCPT ); Tue, 8 Mar 2022 15:57:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233035AbiCHU5c (ORCPT ); Tue, 8 Mar 2022 15:57:32 -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 7347A5004A for ; Tue, 8 Mar 2022 12:56:35 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id ge19-20020a17090b0e1300b001bcca16e2e7so3262377pjb.3 for ; Tue, 08 Mar 2022 12:56:35 -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=1sHi12oEm3E/t24MftHPPCsXxHeW61kYnNhOf+LhGIw=; b=NBNukXaJNcFM/m+tUQZ44Qy4Lwop0t+AdSS8pIf0xIrsXiUXfd/lK2cJstpEhpOBSr ekpVb2aPAbopDU+K1F96kCw8Nw0CzFHh9d0aP0IKx1D+3yvpQBaTIIlkECBZ9eLJHWg2 bb/n3kddV3AhUsjjeq9NtFBXA4teBqD7NkCi7ts3L3IE459WTSETgWgUED+2XfZBWVPO NAKS/JttaKZ20Y5zCqcWDCWD7h06/y5stkanP+2g5gSoARtJklGSsPfGqIhiOlyGnkjA C2Qw1gYDbtdY2XW1st8WIIzcTPUkMVhFo3RVDNblxL+I3INAnuFsICxqZriS5JG7Rpt5 Vbiw== 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=1sHi12oEm3E/t24MftHPPCsXxHeW61kYnNhOf+LhGIw=; b=bKgmRKWKtgXeKlff2x5y7ZZuUSX7XPiSah23Y4O4eSZiYvB/sggTaP3rYwDIA4u0a9 H82rvfumpa1e4b8Ps+D3zbB4CVtbe2mXlvxMxIdtezZuz+g8bGhQHfpUoP21THvo87Nj 4AhwR61VP6BuFp5aPWn2HxjYnvea/ZsqCHuBPQ+xSBrUBpAwmmotVBKrZ6xPhl3NwFs1 N6yia0Jfh6D10FjhoH8Cetyk4ub5oOsavjtSMZMbuJwnVxbeF4yU31jr8cNwra+7qfzl zX9shUUk2YtTr3y6WPTYSIMY+UVmvMiI88S58IGtbVNK7sKxPqVfp/5bH3h6CnkMxM5E 7CJw== X-Gm-Message-State: AOAM5337lHyCXrYpH+62SafTT6muZKtjUiZ+Wv0OoXI99J7qyk2LfauL gcNVuNZOQqKLNFw8hSztzE0= X-Google-Smtp-Source: ABdhPJy8Nqf48NfshCenKmm4eTMb8NfChK4bTOYYuiGTSDoXdFluZEwAeZkSo6QOFCZ4vRL6Lc7Aiw== X-Received: by 2002:a17:902:f712:b0:149:d41a:baa8 with SMTP id h18-20020a170902f71200b00149d41abaa8mr19248230plo.115.1646772995019; Tue, 08 Mar 2022 12:56:35 -0800 (PST) Received: from localhost.localdomain ([103.85.9.4]) by smtp.gmail.com with ESMTPSA id u10-20020a056a00124a00b004f741eb11d0sm1252661pfi.149.2022.03.08.12.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 12:56:34 -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 1/2] staging: r8188eu: call _cancel_timer_ex from _rtw_free_recv_priv Date: Wed, 9 Mar 2022 02:25:09 +0530 Message-Id: <20220308205510.48431-2-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220308205510.48431-1-makvihas@gmail.com> References: <20220308205510.48431-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 08:04:25 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 4FB98C433FE for ; Tue, 8 Mar 2022 20:56:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349891AbiCHU5j (ORCPT ); Tue, 8 Mar 2022 15:57:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233035AbiCHU5g (ORCPT ); Tue, 8 Mar 2022 15:57:36 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24F8851E5B for ; Tue, 8 Mar 2022 12:56:39 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id e3so302401pjm.5 for ; Tue, 08 Mar 2022 12:56:39 -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=8S8Qc5du8q8iXMWiizollg+y08pSQtHFMISLIZOfmxc=; b=VPn6oa8gpFPLYzoFh6lAN+Q0LDFSvXnFJLDHEdn24xbm3GWzY6nSpFNCkr0/2+r7FL 1uhF9J6esX5X0oXfvW4I5l9XXVivOPcu5aKFtAdZ5B8TprMil8oTxWbd8ZSnE5Rg/+5p vdPtGVWt6c1ZwpOM4tCsilm4f8PsaTmue19y08QuSZF+YmB7BUqWGDGgl/L7wSVvRiGA WkMFiaJGzPYQ/l4UrsVg7KSMK9lQ/pLTDid2Kw4nRCHFgbw9Hxb9y7DiY+H1+bbwVFRZ 9/HVtGHsal5+1RezHWUgPmHLJ+ZMDhN1SxMVhCmvHvyCWZLnQEOpdO0alEMYmuMj14dP IPNQ== 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=8S8Qc5du8q8iXMWiizollg+y08pSQtHFMISLIZOfmxc=; b=pnyI15tfw1o0fkf9xeqBcRNUkp6lQVO4uncmSbcx9oqsGU9u0fxLVx7JSfV+GLgx/x mO84HtAO/dPSrrzNYq6noFJJDaG+M0jSL63PVzn1owGQMZXAwnb/9S2NKYIJDTldoF6e 992ZsEgxmQtgJtMNQVr1Qr2hqch6fQiuZBpkULYJiJMAg6f3tzqedjAYsuCFO4uS9h2Y zUaRMRHYXAcmm0wuUoZ0ZXFqFVJkTAU2HVCSOj7fzgmnZ12oFtByvj22VHEFWoOVpOF+ nXvN2S7ux/RJGlCGFeFcIv80KAVtuZewQI6SSNj0p0jHnXuOijGDS+DI0j3mpIdOz2bd 3XJQ== X-Gm-Message-State: AOAM532KQ3HNk89sSft6zi/CPpK4oFEYHRTuLI7CFayBrMcYSMbsH9g8 RERWGcyeSuYMRczg9+lGEjHupzH1qoa3Ew== X-Google-Smtp-Source: ABdhPJxTU+k8VbUnz5FYJtFfhaPn5ce7zc55gBOelRp6kTIdZdSvcy4Ex9fCg73Wm4h/VFOmMUuhSA== X-Received: by 2002:a17:90b:3807:b0:1bf:6c8e:f9d1 with SMTP id mq7-20020a17090b380700b001bf6c8ef9d1mr6651514pjb.186.1646772998682; Tue, 08 Mar 2022 12:56:38 -0800 (PST) Received: from localhost.localdomain ([103.85.9.4]) by smtp.gmail.com with ESMTPSA id u10-20020a056a00124a00b004f741eb11d0sm1252661pfi.149.2022.03.08.12.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 12:56:38 -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 2/2] staging: r8188eu: proper error handling in rtw_init_drv_sw Date: Wed, 9 Mar 2022 02:25:10 +0530 Message-Id: <20220308205510.48431-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220308205510.48431-1-makvihas@gmail.com> References: <20220308205510.48431-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=20 _FAIL instead of proper logging and calling freeing counterparts of previous init functions. This leads to various memory leaks and can be found in=20 /sys/kernel/debug/kmemleak if kernel is compiled with DEBUG_KMEMLEAK=3Dy. Fix this and keep the success and error separate. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- Tested on Comfast CF-WU810N RTL8188EUS wireless adapter. This patch depends on "[PATCH 1/2] staging: r8188eu: call _cancel_timer_ex = from _rtw_free_recv_priv" --- 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..6279bba07 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) { + pr_err("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) { + pr_err("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) { + pr_err("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) { + pr_err("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) { + pr_err("_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) { + pr_err("_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) { + pr_err("_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