From owner-svn-src-all@FreeBSD.ORG  Mon Apr 20 23:23:32 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 04D2A106564A;
	Mon, 20 Apr 2009 23:23:32 +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 E66FF8FC17;
	Mon, 20 Apr 2009 23:23:31 +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 n3KNNVca061187;
	Mon, 20 Apr 2009 23:23:31 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KNNVQp061186;
	Mon, 20 Apr 2009 23:23:31 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200904202323.n3KNNVQp061186@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 20 Apr 2009 23:23:31 +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: r191342 - head/sys/net
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: Mon, 20 Apr 2009 23:23:32 -0000

Author: rwatson
Date: Mon Apr 20 23:23:31 2009
New Revision: 191342
URL: http://svn.freebsd.org/changeset/base/191342

Log:
  Acquire address list lock before walking an interface's address list to
  identify possible jail addresses on it for IPv4 and IPv6.
  
  MFC after:	2 weeks

Modified:
  head/sys/net/rtsock.c

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Mon Apr 20 22:56:34 2009	(r191341)
+++ head/sys/net/rtsock.c	Mon Apr 20 23:23:31 2009	(r191342)
@@ -356,6 +356,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 		 * Try to find an address on the given outgoing interface
 		 * that belongs to the jail.
 		 */
+		IF_ADDR_LOCK(ifp);
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			struct sockaddr *sa;
 			sa = ifa->ifa_addr;
@@ -367,6 +368,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 				break;
 			}
 		}
+		IF_ADDR_UNLOCK(ifp);
 		if (!found) {
 			/*
 			 * As a last resort return the 'default' jail address.
@@ -394,6 +396,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 		 * Try to find an address on the given outgoing interface
 		 * that belongs to the jail.
 		 */
+		IF_ADDR_LOCK(ifp);
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			struct sockaddr *sa;
 			sa = ifa->ifa_addr;
@@ -406,6 +409,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 				break;
 			}
 		}
+		IF_ADDR_UNLOCK(ifp);
 		if (!found) {
 			/*
 			 * As a last resort return the 'default' jail address.