svn commit: r318214 - head/sys/dev/iwm

Adrian Chadd adrian at FreeBSD.org
Fri May 12 05:21:52 UTC 2017


Author: adrian
Date: Fri May 12 05:21:50 2017
New Revision: 318214
URL: https://svnweb.freebsd.org/changeset/base/318214

Log:
  [iwm] Sanity check channel for IEEE80211_CHAN_ANYC in if_iwm_mac_ctxt.c.
  
  * This avoids panicing in some broken vap state handling cases.
  
  Obtained from:	dragonflybsd.git 10d5b77b5421e7cbcc426160edbe858d1d610a29

Modified:
  head/sys/dev/iwm/if_iwm_mac_ctxt.c

Modified: head/sys/dev/iwm/if_iwm_mac_ctxt.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_mac_ctxt.c	Fri May 12 05:21:02 2017	(r318213)
+++ head/sys/dev/iwm/if_iwm_mac_ctxt.c	Fri May 12 05:21:50 2017	(r318214)
@@ -308,7 +308,7 @@ iwm_mvm_mac_ctxt_cmd_common(struct iwm_s
 	/*
 	 * Default to 2ghz if no node information is given.
 	 */
-	if (in) {
+	if (in && in->in_ni.ni_chan != IEEE80211_CHAN_ANYC) {
 		is2ghz = !! IEEE80211_IS_CHAN_2GHZ(in->in_ni.ni_chan);
 	} else {
 		is2ghz = 1;


More information about the svn-src-head mailing list