From owner-svn-src-user@FreeBSD.ORG  Tue Nov  4 03:47:20 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14CAA1065680;
	Tue,  4 Nov 2008 03:47:20 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 044158FC13;
	Tue,  4 Nov 2008 03:47:20 +0000 (UTC)
	(envelope-from kmacy@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 mA43lJ6D085375;
	Tue, 4 Nov 2008 03:47:19 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA43lJVv085374;
	Tue, 4 Nov 2008 03:47:19 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811040347.mA43lJVv085374@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 4 Nov 2008 03:47:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184613 - user/kmacy/HEAD_fast_xmit/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2008 03:47:20 -0000

Author: kmacy
Date: Tue Nov  4 03:47:19 2008
New Revision: 184613
URL: http://svn.freebsd.org/changeset/base/184613

Log:
  don't leak rtentry references on insert failure

Modified:
  user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Nov  4 03:42:01 2008	(r184612)
+++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Nov  4 03:47:19 2008	(r184613)
@@ -483,7 +483,7 @@ flowtable_set_hashkey(struct flowtable *
 		hashkey[i] = key[i];
 }
 
-static void
+static int
 flowtable_insert(struct flowtable *ft, uint32_t hash, uint32_t *key,
     uint8_t proto, struct rtentry *rt, u_char *desten, uint16_t flags)
 {
@@ -505,7 +505,7 @@ retry:	
 		}
 		FL_ENTRY_UNLOCK(ft, hash);
 		if (!stale)
-			return;
+			return (ENOSPC);
 		RTFREE(rt0);
 		/*
 		 * We might end up on a different cpu
@@ -522,6 +522,7 @@ retry:	
 	fle->f_uptime = time_uptime;
 	memcpy(fle->f_desten, desten, ETHER_ADDR_LEN);
 	FL_ENTRY_UNLOCK(ft, hash);
+	return (0);
 }
 
 void
@@ -670,10 +671,12 @@ uncached:
 #endif
 		route_to_rtentry_info(&ro, error ? NULL : desten, ri);
 
-		if (error == 0 && cache)
-			flowtable_insert(ft, hash, key, proto,
+		if (error == 0 && cache) {
+			error = flowtable_insert(ft, hash, key, proto,
 			    ro.ro_rt, desten, flags);
-		else
+				
+		} 
+		if (error || !cache)
 			RTFREE(ro.ro_rt);
 		error = 0;
 	}