public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Haowen Bai <baihaowen@meizu.com>
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
	gregkh@linuxfoundation.org, linux-staging@lists.linux.dev,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: r8188eu: simplify unnecessary NULL check
Date: Fri, 11 Mar 2022 14:11:20 +0300	[thread overview]
Message-ID: <20220311111120.GJ3293@kadam> (raw)
In-Reply-To: <1646994801-26211-1-git-send-email-baihaowen@meizu.com>

On Fri, Mar 11, 2022 at 06:33:21PM +0800, Haowen Bai wrote:
> remove the optimisation of NULL checking it inline, kfree/rtw_free_netdev
> will take care if that would ever be the case.
> 
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
>  drivers/staging/r8188eu/os_dep/usb_intf.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
> index 91792df..8d1ac48 100644
> --- a/drivers/staging/r8188eu/os_dep/usb_intf.c
> +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
> @@ -425,10 +425,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
>  		rtw_handle_dualmac(padapter, 0);
>  free_adapter:
>  	if (status != _SUCCESS) {
> -		if (pnetdev)
> -			rtw_free_netdev(pnetdev);
> -		else if (padapter)
> -			vfree(padapter);
> +		rtw_free_netdev(pnetdev);
> +		vfree(padapter);

The rtw_free_netdev() frees padapter so this patch would introduce a
double free.

This driver is kind of garbage so I don't really fault you for making
this mistake.  If the error handling and cleanup were written in the
correct way it would avoid accidentally creating bugs like this:

https://lore.kernel.org/all/20210831084735.GL12231@kadam/

The correct thing is to not call rtw_free_netdev() from rtw_usb_if1_init()
but to instead call:

free_netdev:
	free_netdev(pnetdev);
handle_dualmac:
	rtw_handle_dualmac(padapter, 0);
free_padapter:
	vfree(padapter);

Also you need to work against the latest linux-next or staging-next
tree.

regards,
dan carpenter




  reply	other threads:[~2022-03-11 11:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11 10:33 [PATCH] staging: r8188eu: simplify unnecessary NULL check Haowen Bai
2022-03-11 11:11 ` Dan Carpenter [this message]
2022-03-11 19:13 ` Pavel Skripkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220311111120.GJ3293@kadam \
    --to=dan.carpenter@oracle.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=baihaowen@meizu.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=phil@philpotter.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox