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

Kyle Evans kevans at FreeBSD.org
Fri Aug 10 13:06:15 UTC 2018


Author: kevans
Date: Fri Aug 10 13:06:14 2018
New Revision: 337570
URL: https://svnweb.freebsd.org/changeset/base/337570

Log:
  bwi(4): Set ic->ic_softc before bwi_getradiocaps to avoid bad deref
  
  Submitted by:	François Revol <revol at free.fr>
  Obtained from:	Haiku (ba88131cfde64e21bedb4ebedd699cfa5e7fd314)
  MFC after:	1 week

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

Modified: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c	Fri Aug 10 10:37:25 2018	(r337569)
+++ head/sys/dev/bwi/if_bwi.c	Fri Aug 10 13:06:14 2018	(r337570)
@@ -490,10 +490,12 @@ bwi_attach(struct bwi_softc *sc)
 				   BWI_SPROM_CARD_INFO_LOCALE);
 	DPRINTF(sc, BWI_DBG_ATTACH, "locale: %d\n", sc->sc_locale);
 	/* XXX use locale */
+
+	ic->ic_softc = sc;
+
 	bwi_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
 	    ic->ic_channels);
 
-	ic->ic_softc = sc;
 	ic->ic_name = device_get_nameunit(dev);
 	ic->ic_caps = IEEE80211_C_STA |
 		      IEEE80211_C_SHSLOT |


More information about the svn-src-all mailing list