svn commit: r206370 - head/sys/dev/bwi

Rui Paulo rpaulo at FreeBSD.org
Wed Apr 7 17:49:48 UTC 2010


Author: rpaulo
Date: Wed Apr  7 17:49:47 2010
New Revision: 206370
URL: http://svn.freebsd.org/changeset/base/206370

Log:
  Avoid NULL deref.
  
  Submitted by:	gavin
  MFC after:	1 month

Modified:
  head/sys/dev/bwi/if_bwi.c

Modified: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c	Wed Apr  7 17:48:13 2010	(r206369)
+++ head/sys/dev/bwi/if_bwi.c	Wed Apr  7 17:49:47 2010	(r206370)
@@ -3368,10 +3368,10 @@ _bwi_txeof(struct bwi_softc *sc, uint16_
 	bus_dmamap_unload(sc->sc_buf_dtag, tb->tb_dmap);
 
 	ni = tb->tb_ni;
-	vap = ni->ni_vap;
 	if (tb->tb_ni != NULL) {
 		const struct bwi_txbuf_hdr *hdr =
 		    mtod(tb->tb_mbuf, const struct bwi_txbuf_hdr *);
+		vap = ni->ni_vap;
 
 		/* NB: update rate control only for unicast frames */
 		if (hdr->txh_mac_ctrl & htole32(BWI_TXH_MAC_C_ACK)) {


More information about the svn-src-all mailing list