From owner-svn-src-all@freebsd.org  Thu May 19 22:02:04 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67293B42886;
 Thu, 19 May 2016 22:02:04 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 349221D93;
 Thu, 19 May 2016 22:02:04 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4JM23qE027246;
 Thu, 19 May 2016 22:02:03 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4JM23sW027245;
 Thu, 19 May 2016 22:02:03 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201605192202.u4JM23sW027245@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Thu, 19 May 2016 22:02:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300237 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 May 2016 22:02:04 -0000

Author: avos
Date: Thu May 19 22:02:03 2016
New Revision: 300237
URL: https://svnweb.freebsd.org/changeset/base/300237

Log:
  net80211: restore interface state check for IEEE80211_IOC_SCAN_REQ ioctl.
  
  Do not try to start a scan when interface is not running.
  
  How-to-reproduce:
  1) ifconfig wlan0 create wlandev urtwn0
  2) wlandebug -i wlan0 state
  3) ifconfig wlan0 scan

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Thu May 19 21:47:57 2016	(r300236)
+++ head/sys/net80211/ieee80211_ioctl.c	Thu May 19 22:02:03 2016	(r300237)
@@ -2486,6 +2486,11 @@ ieee80211_scanreq(struct ieee80211vap *v
 	 * Otherwise just invoke the scan machinery directly.
 	 */
 	IEEE80211_LOCK(ic);
+	if (ic->ic_nrunning == 0) {
+		IEEE80211_UNLOCK(ic);
+		return ENXIO;
+	}
+
 	if (vap->iv_state == IEEE80211_S_INIT) {
 		/* NB: clobbers previous settings */
 		vap->iv_scanreq_flags = sr->sr_flags;