From owner-svn-src-head@FreeBSD.ORG  Mon Apr 20 22:56:34 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 90C1C1065673;
	Mon, 20 Apr 2009 22:56:34 +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 7DFA78FC14;
	Mon, 20 Apr 2009 22:56:34 +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 n3KMuYr7060511;
	Mon, 20 Apr 2009 22:56:34 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KMuYfh060509;
	Mon, 20 Apr 2009 22:56:34 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200904202256.n3KMuYfh060509@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 20 Apr 2009 22:56:34 +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: r191341 - head/sys/netinet6
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: Mon, 20 Apr 2009 22:56:35 -0000

Author: rwatson
Date: Mon Apr 20 22:56:34 2009
New Revision: 191341
URL: http://svn.freebsd.org/changeset/base/191341

Log:
  Assert the interface address list lock in IFP_TO_IA6(), as it will
  iterate the interface address list.  Marginally expand IF_ADDR_LOCK()
  coverage in mld6.c to make sure it's held when IFP_TO_IA6() is called.
  
  MFC after:	2 weeks

Modified:
  head/sys/netinet6/in6_var.h
  head/sys/netinet6/mld6.c

Modified: head/sys/netinet6/in6_var.h
==============================================================================
--- head/sys/netinet6/in6_var.h	Mon Apr 20 22:45:21 2009	(r191340)
+++ head/sys/netinet6/in6_var.h	Mon Apr 20 22:56:34 2009	(r191341)
@@ -503,6 +503,7 @@ MALLOC_DECLARE(M_IP6MADDR);
 /* struct in6_ifaddr *ia; */				\
 do {									\
 	struct ifaddr *ifa;						\
+	IF_ADDR_LOCK_ASSERT(ifp);					\
 	TAILQ_FOREACH(ifa, &(ifp)->if_addrhead, ifa_link) {		\
 		if (ifa->ifa_addr->sa_family == AF_INET6)		\
 			break;						\

Modified: head/sys/netinet6/mld6.c
==============================================================================
--- head/sys/netinet6/mld6.c	Mon Apr 20 22:45:21 2009	(r191340)
+++ head/sys/netinet6/mld6.c	Mon Apr 20 22:56:34 2009	(r191341)
@@ -360,9 +360,12 @@ mld6_input(struct mbuf *m, int off)
 		 */
 		timer = ntohs(mldh->mld_maxdelay);
 
+		IF_ADDR_LOCK(ifp);
 		IFP_TO_IA6(ifp, ia);
-		if (ia == NULL)
+		if (ia == NULL) {
+			IF_ADDR_UNLOCK(ifp);
 			break;
+		}
 
 		/*
 		 * XXX: System timer resolution is too low to handle Max
@@ -374,7 +377,6 @@ mld6_input(struct mbuf *m, int off)
 		if (timer == 0 && mldh->mld_maxdelay)
 			timer = 1;
 
-		IF_ADDR_LOCK(ifp);
 		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_addr->sa_family != AF_INET6)
 				continue;