svn commit: r343682 - head/sys/dev/wtap

Rodney W. Grimes freebsd at pdx.rh.CN85.dnsmgr.net
Sat Feb 2 17:26:06 UTC 2019


[ Charset UTF-8 unsupported, converting... ]
> Author: avos
> Date: Sat Feb  2 16:15:46 2019
> New Revision: 343682
> URL: https://svnweb.freebsd.org/changeset/base/343682
> 
> Log:
>   sys/dev/wtap: Check return value from malloc(..., M_NOWAIT) and
>   drop unneeded cast.
>   
>   MFC after:	3 days
> 
> Modified:
>   head/sys/dev/wtap/if_wtap.c
> 
> Modified: head/sys/dev/wtap/if_wtap.c
> ==============================================================================
> --- head/sys/dev/wtap/if_wtap.c	Sat Feb  2 16:07:56 2019	(r343681)
> +++ head/sys/dev/wtap/if_wtap.c	Sat Feb  2 16:15:46 2019	(r343682)
> @@ -373,7 +373,7 @@ wtap_vap_delete(struct ieee80211vap *vap)
>  	destroy_dev(avp->av_dev);
>  	callout_stop(&avp->av_swba);
>  	ieee80211_vap_detach(vap);
> -	free((struct wtap_vap*) vap, M_80211_VAP);
> +	free(avp, M_80211_VAP);

First one crees vap, second one frees avp, is that a typo, or intended change?

>  }
>  
>  static void
> @@ -602,6 +602,8 @@ wtap_node_alloc(struct ieee80211vap *vap, const uint8_
>  
>  	ni = malloc(sizeof(struct ieee80211_node), M_80211_NODE,
>  	    M_NOWAIT|M_ZERO);
> +	if (ni == NULL)
> +		return (NULL);
>  
>  	ni->ni_txrate = 130;
>  	return ni;
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org


More information about the svn-src-all mailing list