svn commit: r191342 - head/sys/net

[Robert Watson]

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.