From owner-p4-projects@FreeBSD.ORG  Thu Aug  7 15:30:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF66E37B404; Thu,  7 Aug 2003 15:30:56 -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 504AF37B401
	for <perforce@freebsd.org>; Thu,  7 Aug 2003 15:30:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E914143F85
	for <perforce@freebsd.org>; Thu,  7 Aug 2003 15:30:55 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h77MUt0U024121
	for <perforce@freebsd.org>; Thu, 7 Aug 2003 15:30:55 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h77MUtBU024118
	for perforce@freebsd.org; Thu, 7 Aug 2003 15:30:55 -0700 (PDT)
Date: Thu, 7 Aug 2003 15:30:55 -0700 (PDT)
Message-Id: <200308072230.h77MUtBU024118@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 35749 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: Thu, 07 Aug 2003 22:30:57 -0000

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

Change 35749 by sam@sam_ebb on 2003/08/07 15:29:55

	o must unlock before destroying mutex
	o must lock rt_gwroute before freeing when cleaning up on error

Affected files ...

.. //depot/projects/netperf/sys/net/route.c#5 edit

Differences ...

==== //depot/projects/netperf/sys/net/route.c#5 (text+ko) ====

@@ -275,6 +275,7 @@
 		/*
 		 * and the rtentry itself of course
 		 */
+		RT_UNLOCK(rt);
 		RT_LOCK_DESTROY(rt);
 		Free(rt);
 		return;
@@ -648,6 +649,7 @@
 		 */
 		RT_LOCK(rt);
 		if ((error = rt_setgate(rt, dst, gateway)) != 0) {
+			RT_UNLOCK(rt);
 			RT_LOCK_DESTROY(rt);
 			Free(rt);
 			senderr(error);
@@ -707,11 +709,11 @@
 		 */
 		if (rn == 0) {
 			if (rt->rt_gwroute)
-				rtfree(rt->rt_gwroute);
+				RTFREE(rt->rt_gwroute);
 			if (rt->rt_ifa)
 				IFAFREE(rt->rt_ifa);
 			Free(rt_key(rt));
-			/* XXX still locked */
+			RT_UNLOCK(rt);
 			RT_LOCK_DESTROY(rt);
 			Free(rt);
 			senderr(EEXIST);