From owner-p4-projects@FreeBSD.ORG  Tue Oct  7 13:52:25 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C7F216A4C0; Tue,  7 Oct 2003 13:52:25 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E0A1B16A4B3
	for <perforce@freebsd.org>; Tue,  7 Oct 2003 13:52:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9491B43FE0
	for <perforce@freebsd.org>; Tue,  7 Oct 2003 13:52:23 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h97KqNXJ080916
	for <perforce@freebsd.org>; Tue, 7 Oct 2003 13:52:23 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h97KqMoB080913
	for perforce@freebsd.org; Tue, 7 Oct 2003 13:52:22 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Tue, 7 Oct 2003 13:52:22 -0700 (PDT)
Message-Id: <200310072052.h97KqMoB080913@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 39333 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2003 20:52:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=39333

Change 39333 by sam@sam_ebb on 2003/10/07 13:51:54

	must lock route when the caller provided a route but not
	interface; otherwise the subsequent unlock blows up

Affected files ...

.. //depot/projects/netperf/sys/netinet6/ip6_output.c#10 edit

Differences ...

==== //depot/projects/netperf/sys/netinet6/ip6_output.c#10 (text+ko) ====

@@ -609,6 +609,7 @@
 			/* XXX in6_ifstat_inc(ifp, ifs6_out_discard); */
 			goto bad;
 		}
+		/* XXX rt not locked */
 		ia = ifatoia6(ro->ro_rt->rt_ifa);
 		ifp = ro->ro_rt->rt_ifp;
 		ro->ro_rt->rt_use++;
@@ -694,10 +695,11 @@
 		 * ``net'' ff00::/8).
 		 */
 		if (ifp == NULL) {
-			if (ro->ro_rt == 0) {
+			if (ro->ro_rt == 0)
 				ro->ro_rt = rtalloc1((struct sockaddr *)
 						&ro->ro_dst, 0, 0UL);
-			}
+			else
+				RT_LOCK(ro->ro_rt);
 			if (ro->ro_rt == 0) {
 				ip6stat.ip6s_noroute++;
 				error = EHOSTUNREACH;