From owner-svn-src-stable@freebsd.org  Mon Feb  8 00:07:03 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 66B6CAA15A8;
 Mon,  8 Feb 2016 00:07:03 +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 38D111C2D;
 Mon,  8 Feb 2016 00:07:03 +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 u18072h8065681;
 Mon, 8 Feb 2016 00:07:02 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18072uD065679;
 Mon, 8 Feb 2016 00:07:02 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201602080007.u18072uD065679@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: Mon, 8 Feb 2016 00:07:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r295389 - in stable/10/sys: netinet netinet6
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2016 00:07:03 -0000

Author: bz
Date: Mon Feb  8 00:07:01 2016
New Revision: 295389
URL: https://svnweb.freebsd.org/changeset/base/295389

Log:
  MFC r292601,292654:
  
    Since r256624 (head) we have 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
    Reviewed by:          gnn
    Differential Revision:https://reviews.freebsd.org/D4530
  
  Approved by:		re (gjb)

Modified:
  stable/10/sys/netinet/in_rmx.c
  stable/10/sys/netinet6/in6_rmx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/in_rmx.c
==============================================================================
--- stable/10/sys/netinet/in_rmx.c	Sun Feb  7 23:42:36 2016	(r295388)
+++ stable/10/sys/netinet/in_rmx.c	Mon Feb  8 00:07:01 2016	(r295389)
@@ -373,7 +373,7 @@ in_detachhead(void **head, int off)
 {
 
 	callout_drain(&V_rtq_timer);
-	return (1);
+	return (rn_detachhead(head));
 }
 #endif
 

Modified: stable/10/sys/netinet6/in6_rmx.c
==============================================================================
--- stable/10/sys/netinet6/in6_rmx.c	Sun Feb  7 23:42:36 2016	(r295388)
+++ stable/10/sys/netinet6/in6_rmx.c	Mon Feb  8 00:07:01 2016	(r295389)
@@ -290,7 +290,7 @@ in6_detachhead(void **head, int off)
 {
 
 	callout_drain(&V_rtq_mtutimer);
-	return (1);
+	return (rn_detachhead(head));
 }
 #endif