public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: walter harms <wharms@bfs.de>
To: kernel-janitors@vger.kernel.org
Subject: Re: [patch] Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd()
Date: Wed, 15 Jan 2014 09:04:46 +0000	[thread overview]
Message-ID: <52D64F2E.2020202@bfs.de> (raw)
In-Reply-To: <20131107075543.GM21844@elgon.mountain>



Am 07.11.2013 08:55, schrieb Dan Carpenter:
> We fixed this to use free_netdev() instead of kfree() but unfortunately
> free_netdev() doesn't accept NULL pointers.  Smatch complains about
> this, it's not something I discovered through testing.
> 
> Fixes: 3030d40b5036 ('staging: vt6655: use free_netdev instead of kfree')
> Fixes: 0a438d5b381e ('staging: vt6656: use free_netdev instead of kfree')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
> index aab0012..ab8b2ba 100644
> --- a/drivers/staging/vt6655/hostap.c
> +++ b/drivers/staging/vt6655/hostap.c
> @@ -143,7 +143,8 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
>  		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
>  			pDevice->dev->name, pDevice->apdev->name);
>  	}
> -	free_netdev(pDevice->apdev);
> +	if (pDevice->apdev)
> +		free_netdev(pDevice->apdev);


perhaps the better way is to fix free_netdev() to make it behave like kfree() and friends.

just my 2 cents,
 wh

>  	pDevice->apdev = NULL;
>  	pDevice->bEnable8021x = false;
>  	pDevice->bEnableHostWEP = false;
> diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
> index ae1676d..67ba48b 100644
> --- a/drivers/staging/vt6656/hostap.c
> +++ b/drivers/staging/vt6656/hostap.c
> @@ -133,7 +133,8 @@ static int hostap_disable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
>  		       pDevice->dev->name, pDevice->apdev->name);
>  	}
> -	free_netdev(pDevice->apdev);
> +	if (pDevice->apdev)
> +		free_netdev(pDevice->apdev);
>  	pDevice->apdev = NULL;
>      pDevice->bEnable8021x = false;
>      pDevice->bEnableHostWEP = false;
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

  parent reply	other threads:[~2014-01-15  9:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-07  7:55 [patch] Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd() Dan Carpenter
2013-11-07  8:45 ` Waskiewicz Jr, Peter P
2014-01-15  9:04 ` walter harms [this message]
2014-01-15 10:14 ` Dan Carpenter

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=52D64F2E.2020202@bfs.de \
    --to=wharms@bfs.de \
    --cc=kernel-janitors@vger.kernel.org \
    /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