svn commit: r304715 - stable/11/sys/net80211

Bryan Drewery bdrewery at FreeBSD.org
Wed Aug 24 01:44:55 UTC 2016


Author: bdrewery
Date: Wed Aug 24 01:44:53 2016
New Revision: 304715
URL: https://svnweb.freebsd.org/changeset/base/304715

Log:
  MFC r304322:
  
    [net80211] correctly lock the ifp before accessing the lladdr.

Modified:
  stable/11/sys/net80211/ieee80211_ioctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_ioctl.c	Wed Aug 24 01:34:22 2016	(r304714)
+++ stable/11/sys/net80211/ieee80211_ioctl.c	Wed Aug 24 01:44:53 2016	(r304715)
@@ -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:


More information about the svn-src-all mailing list