Date: Wed, 7 Apr 2010 17:49:48 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r206370 - head/sys/dev/bwi Message-ID: <201004071749.o37HnmVP067193@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004071749.o37HnmVP067193>