From owner-p4-projects@FreeBSD.ORG  Thu Dec 13 21:30:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E21516A469; Thu, 13 Dec 2007 21:30:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D179916A421
	for <perforce@freebsd.org>; Thu, 13 Dec 2007 21:29:59 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B622513C468
	for <perforce@freebsd.org>; Thu, 13 Dec 2007 21:29:59 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDLTxvv093426
	for <perforce@freebsd.org>; Thu, 13 Dec 2007 21:29:59 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDLTxkd093423
	for perforce@freebsd.org; Thu, 13 Dec 2007 21:29:59 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 13 Dec 2007 21:29:59 GMT
Message-Id: <200712132129.lBDLTxkd093423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130813 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 13 Dec 2007 21:30:00 -0000

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

Change 130813 by kmacy@kmacy:storage:toestack on 2007/12/13 21:29:52

	don't leak rtentry reference in case of failure

Affected files ...

.. //depot/projects/toestack/sys/netinet/tcp_ofld.c#9 edit

Differences ...

==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#9 (text+ko) ====

@@ -56,7 +56,7 @@
 	struct ifnet *ifp;
 	struct toedev *tdev;
 	struct rtentry *rt;
-	int error;
+	int error = 0;
 
 	rt = rtalloc2(nam, 1, 0);
 	if (rt == NULL)
@@ -64,16 +64,23 @@
 
 	ifp = rt->rt_ifp;
 	tdev = TOEDEV(ifp);
-	if (tdev == NULL)
-		return (EINVAL);
-
-	if (tdev->tod_can_offload(tdev, so) == 0)
-		return (EINVAL);
-
+	if (tdev == NULL) {
+		error = EINVAL;
+		goto fail;
+	}
+	
+	if (tdev->tod_can_offload(tdev, so) == 0) {
+		error = EINVAL;
+		goto fail;
+	}
+	
 	if ((error = tdev->tod_connect(tdev, so, rt, nam)))
-		return (error);
-
+		goto fail;
+	
 	return (0);
+fail:
+	RTFREE(rt);
+	return (error);
 }
 
 int