From owner-svn-src-head@freebsd.org  Thu Aug 18 01:25:13 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D750CBBD8AB;
 Thu, 18 Aug 2016 01:25:13 +0000 (UTC)
 (envelope-from adrian@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 AA32B1316;
 Thu, 18 Aug 2016 01:25:13 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7I1PCe4014170;
 Thu, 18 Aug 2016 01:25:12 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7I1PCs3014169;
 Thu, 18 Aug 2016 01:25:12 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201608180125.u7I1PCs3014169@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 18 Aug 2016 01:25:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304322 - 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-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Aug 2016 01:25:13 -0000

Author: adrian
Date: Thu Aug 18 01:25:12 2016
New Revision: 304322
URL: https://svnweb.freebsd.org/changeset/base/304322

Log:
  [net80211] correctly lock the ifp before accessing the lladdr.
  
  Tested by: dhw

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Thu Aug 18 00:37:07 2016	(r304321)
+++ head/sys/net80211/ieee80211_ioctl.c	Thu Aug 18 01:25:12 2016	(r304322)
@@ -3394,10 +3394,12 @@ ieee80211_ioctl(struct ifnet *ifp, u_lon
 			 * Check if the MAC address was changed
 			 * via SIOCSIFLLADDR ioctl.
 			 */
+			if_addr_rlock(ifp);
 			if ((ifp->if_flags & IFF_UP) == 0 &&
 			    !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp)))
 				IEEE80211_ADDR_COPY(vap->iv_myaddr,
 				    IF_LLADDR(ifp));
+			if_addr_runlock(ifp);
 		}
 		break;
 	case SIOCADDMULTI: