From owner-svn-src-all@freebsd.org  Wed Aug 24 02:31: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 C65AABC3449;
 Wed, 24 Aug 2016 02:31:04 +0000 (UTC)
 (envelope-from bdrewery@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 92DEE133B;
 Wed, 24 Aug 2016 02:31:04 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7O2V3e1087600;
 Wed, 24 Aug 2016 02:31:03 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7O2V3ru087599;
 Wed, 24 Aug 2016 02:31:03 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201608240231.u7O2V3ru087599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 24 Aug 2016 02:31:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r304719 - releng/11.0/sys/net80211
X-SVN-Group: releng
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: Wed, 24 Aug 2016 02:31:04 -0000

Author: bdrewery
Date: Wed Aug 24 02:31:03 2016
New Revision: 304719
URL: https://svnweb.freebsd.org/changeset/base/304719

Log:
  MFS r304715:
  
    MFC r304322:
  
      [net80211] correctly lock the ifp before accessing the lladdr.
  
  Approved by:	re (gjb)

Modified:
  releng/11.0/sys/net80211/ieee80211_ioctl.c
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- releng/11.0/sys/net80211/ieee80211_ioctl.c	Wed Aug 24 02:29:25 2016	(r304718)
+++ releng/11.0/sys/net80211/ieee80211_ioctl.c	Wed Aug 24 02:31:03 2016	(r304719)
@@ -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: