From owner-svn-src-head@FreeBSD.ORG  Wed Feb  4 10:35:28 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 87833106564A;
	Wed,  4 Feb 2009 10:35:28 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 74C968FC16;
	Wed,  4 Feb 2009 10:35:28 +0000 (UTC) (envelope-from bz@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 n14AZS9I066481;
	Wed, 4 Feb 2009 10:35:28 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n14AZS0q066480;
	Wed, 4 Feb 2009 10:35:28 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200902041035.n14AZS0q066480@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 4 Feb 2009 10:35:28 +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: r188113 - 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: Wed, 04 Feb 2009 10:35:29 -0000

Author: bz
Date: Wed Feb  4 10:35:27 2009
New Revision: 188113
URL: http://svn.freebsd.org/changeset/base/188113

Log:
  When iterating through the list trying to find a router in
  defrouter_select(), NULL the cached llentry after unlocking
  as we are no longer interested in it and with the second
  iteration would try to unlock it again resulting in
  panic: Lock (rw) lle not locked @ ...
  
  Reported by:	Mark Atkinson <m.atkinson@f5.com>
  Tested by:	Mark Atkinson <m.atkinson@f5.com>
  PR:		kern/128247 (in follow-up, unrelated to original report)

Modified:
  head/sys/netinet6/nd6_rtr.c

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Wed Feb  4 01:14:06 2009	(r188112)
+++ head/sys/netinet6/nd6_rtr.c	Wed Feb  4 10:35:27 2009	(r188113)
@@ -651,8 +651,10 @@ defrouter_select(void)
 			selected_dr = dr;
 		}
 		IF_AFDATA_UNLOCK(dr->ifp);
-		if (ln != NULL)
+		if (ln != NULL) {
 			LLE_RUNLOCK(ln);
+			ln = NULL;
+		}
 
 		if (dr->installed && installed_dr == NULL)
 			installed_dr = dr;