[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b5f9dda7-269a-6b50-ddf2-b5fa05aa1d72@gmail.com>
Date: Wed, 9 Mar 2022 00:13:50 +0300
From: Pavel Skripkin <paskripkin@...il.com>
To: Vihas Makwana <makvihas@...il.com>,
Larry Finger <Larry.Finger@...inger.net>,
Phillip Potter <phil@...lpotter.co.uk>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Michael Straube <straube.linux@...il.com>,
Martin Kaiser <martin@...ser.cx>,
Dan Carpenter <dan.carpenter@...cle.com>
Cc: linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] staging: r8188eu: proper error handling in
rtw_init_drv_sw
Hi Vihas,
On 3/8/22 23:55, Vihas Makwana wrote:
> 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=y.
>
> Fix this and keep the success and error separate.
>
>
> Signed-off-by: Vihas Makwana <makvihas@...il.com>
> ---
Fixes: 2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for
RTL8188eu driver")
> 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"
> ---
No need to say that 1/2 depends on 2/2 since they are already in same
patch series :)
> 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/r8188eu/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)
>
> u8 rtw_init_drv_sw(struct adapter *padapter)
> {
> - if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL)
> + if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) {
> + pr_err("rtw_init_cmd_priv failed\n");
Hm, what about
dev_err(dvobj_to_dev(padapter->dvobj), "..."); ?
IIRC it's main usb device for this driver.
@Phillip, @Larry, @Martin, please, correct me if I am wrong here
Random note: We can't use netdev_err here since rtw_init_drv_sw() is
called before netdev registration
> return _FAIL;
> + }
>
> padapter->cmdpriv.padapter = padapter;
Otherwise looks good to me
With regards,
Pavel Skripkin
Powered by blists - more mailing lists