From owner-svn-src-all@FreeBSD.ORG  Sun Apr 19 22:05:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C27F510656A6;
	Sun, 19 Apr 2009 22:05:39 +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 B176B8FC12;
	Sun, 19 Apr 2009 22:05:39 +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 n3JM5dAm021717;
	Sun, 19 Apr 2009 22:05:39 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JM5dDQ021716;
	Sun, 19 Apr 2009 22:05:39 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200904192205.n3JM5dDQ021716@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 19 Apr 2009 22:05:39 +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: r191284 - head/sys/netgraph
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Apr 2009 22:05:40 -0000

Author: rwatson
Date: Sun Apr 19 22:05:39 2009
New Revision: 191284
URL: http://svn.freebsd.org/changeset/base/191284

Log:
  Lock the interface address list while building replies to
  NGM_CISCO_COOKIE messages in ng_iface.
  
  MFC after:	2 weeks

Modified:
  head/sys/netgraph/ng_iface.c

Modified: head/sys/netgraph/ng_iface.c
==============================================================================
--- head/sys/netgraph/ng_iface.c	Sun Apr 19 22:04:29 2009	(r191283)
+++ head/sys/netgraph/ng_iface.c	Sun Apr 19 22:05:39 2009	(r191284)
@@ -668,6 +668,7 @@ ng_iface_rcvmsg(node_p node, item_p item
 			struct ifaddr *ifa;
 
 			/* Return the first configured IP address */
+			IF_ADDR_LOCK(ifp);
 			TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 				struct ng_cisco_ipaddr *ips;
 
@@ -685,6 +686,7 @@ ng_iface_rcvmsg(node_p node, item_p item
 						ifa->ifa_netmask)->sin_addr;
 				break;
 			}
+			IF_ADDR_UNLOCK(ifp);
 
 			/* No IP addresses on this interface? */
 			if (ifa == NULL)