From owner-svn-src-head@freebsd.org  Tue Dec 22 14:53:20 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5363A4E9EE;
 Tue, 22 Dec 2015 14:53:20 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7294B1B0E;
 Tue, 22 Dec 2015 14:53:20 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMErJAf042713;
 Tue, 22 Dec 2015 14:53:19 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMErJko042711;
 Tue, 22 Dec 2015 14:53:19 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201512221453.tBMErJko042711@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 22 Dec 2015 14:53:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292601 - in head/sys: netinet netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2015 14:53:20 -0000

Author: bz
Date: Tue Dec 22 14:53:19 2015
New Revision: 292601
URL: https://svnweb.freebsd.org/changeset/base/292601

Log:
  Since r256624 we've been leaking routing table allocations
  on vnet enabled jail shutdown. Call the provided cleanup
  routines for IP versions 4 and 6 to plug these leaks.
  
  Sponsored by:		The FreeBSD Foundation
  MFC atfer:		2 weeks
  Reviewed by:		gnn
  Differential Revision:	https://reviews.freebsd.org/D4530

Modified:
  head/sys/netinet/in_rmx.c
  head/sys/netinet6/in6_rmx.c

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Tue Dec 22 13:58:11 2015	(r292600)
+++ head/sys/netinet/in_rmx.c	Tue Dec 22 14:53:19 2015	(r292601)
@@ -133,7 +133,7 @@ int
 in_detachhead(void **head, int off)
 {
 
-	return (1);
+	return (rn_detachhead(head));
 }
 #endif
 

Modified: head/sys/netinet6/in6_rmx.c
==============================================================================
--- head/sys/netinet6/in6_rmx.c	Tue Dec 22 13:58:11 2015	(r292600)
+++ head/sys/netinet6/in6_rmx.c	Tue Dec 22 14:53:19 2015	(r292601)
@@ -266,6 +266,7 @@ in6_detachhead(void **head, int off)
 {
 
 	callout_drain(&V_rtq_mtutimer);
+	return (rn_detachhead(head));
 	return (1);
 }
 #endif