From owner-p4-projects@FreeBSD.ORG  Wed Sep 10 17:49:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CB841065685; Wed, 10 Sep 2008 17:49:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 227401065681
	for <perforce@freebsd.org>; Wed, 10 Sep 2008 17:49:51 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E2CE8FC13
	for <perforce@freebsd.org>; Wed, 10 Sep 2008 17:49:51 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8AHnoC8095288
	for <perforce@freebsd.org>; Wed, 10 Sep 2008 17:49:50 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHnnV1095253
	for perforce@freebsd.org; Wed, 10 Sep 2008 17:49:49 GMT
	(envelope-from zec@tel.fer.hr)
Date: Wed, 10 Sep 2008 17:49:49 GMT
Message-Id: <200809101749.m8AHnnV1095253@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149551 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2008 17:49:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=149551

Change 149551 by zec@zec_tpx32 on 2008/09/10 17:48:54

	Hold IFNET_WLOCK() when reassigning an ifnet from one vnet
	to another.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#67 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#67 (text+ko) ====

@@ -298,10 +298,11 @@
 	do {
 		INIT_VNET_NET(curvnet);
 
+		IFNET_WLOCK();
 		ifnet_setbyindex(ifp->if_index, NULL);
-		/* XXX: should be locked with if_findindex() */
 		while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL)
 			V_if_index--;
+		IFNET_WUNLOCK();
 	} while (0);
 
 	CURVNET_SET_QUIET(new_vnet);
@@ -309,9 +310,8 @@
 	/*
 	 * Try to find an empty slot below if_index.  If we fail, take 
 	 * the next slot.
-	 * 
-	 * XXX: should be locked!
 	 */
+	IFNET_WLOCK();
 	for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) {
 		if (ifnet_byindex(ifp->if_index) == NULL)
 			break;
@@ -325,6 +325,7 @@
 	if (V_if_index >= V_if_indexlim)
 		if_grow();
 	ifnet_setbyindex(ifp->if_index, ifp);
+	IFNET_WUNLOCK();
 
 	/* Rename the ifnet */
 	if (new_vnet == ifp->if_home_vnet) {