From owner-svn-src-head@FreeBSD.ORG  Sun Jun 21 20:08:08 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3239E106564A;
	Sun, 21 Jun 2009 20:08:08 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20B178FC08;
	Sun, 21 Jun 2009 20:08:08 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5LK88ur017382;
	Sun, 21 Jun 2009 20:08:08 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5LK88hT017380;
	Sun, 21 Jun 2009 20:08:08 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906212008.n5LK88hT017380@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 21 Jun 2009 20:08:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194606 - head/sys/netipx
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jun 2009 20:08:08 -0000

Author: rwatson
Date: Sun Jun 21 20:08:07 2009
New Revision: 194606
URL: http://svn.freebsd.org/changeset/base/194606

Log:
  In ipx_control(), lock if_addr_mtx when adding/removing addresses from
  interface address lists, and don't add an address until it's fully
  initialized.
  
  MFC after:	3 weeks

Modified:
  head/sys/netipx/ipx.c

Modified: head/sys/netipx/ipx.c
==============================================================================
--- head/sys/netipx/ipx.c	Sun Jun 21 19:50:06 2009	(r194605)
+++ head/sys/netipx/ipx.c	Sun Jun 21 20:08:07 2009	(r194606)
@@ -171,12 +171,9 @@ ipx_control(struct socket *so, u_long cm
 			ia = oia;
 			ifa = (struct ifaddr *)ia;
 			ifa_init(ifa);
-			TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
 			ia->ia_ifp = ifp;
 			ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr;
-
 			ifa->ifa_netmask = (struct sockaddr *)&ipx_netmask;
-
 			ifa->ifa_dstaddr = (struct sockaddr *)&ia->ia_dstaddr;
 			if (ifp->if_flags & IFF_BROADCAST) {
 				ia->ia_broadaddr.sipx_family = AF_IPX;
@@ -185,6 +182,9 @@ ipx_control(struct socket *so, u_long cm
 				ia->ia_broadaddr.sipx_addr.x_host =
 				    ipx_broadhost;
 			}
+			IF_ADDR_LOCK(ifp);
+			TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
+			IF_ADDR_UNLOCK(ifp);
 		}
 		break;
 
@@ -217,7 +217,9 @@ ipx_control(struct socket *so, u_long cm
 	case SIOCDIFADDR:
 		ipx_ifscrub(ifp, ia);
 		ifa = (struct ifaddr *)ia;
+		IF_ADDR_LOCK(ifp);
 		TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link);
+		IF_ADDR_UNLOCK(ifp);
 		oia = ia;
 		if (oia == (ia = ipx_ifaddr)) {
 			ipx_ifaddr = ia->ia_next;