From owner-svn-src-all@freebsd.org  Thu Mar 24 03:08:40 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 54B19ADBBFB;
 Thu, 24 Mar 2016 03:08:40 +0000 (UTC)
 (envelope-from bdrewery@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 1E9A11610;
 Thu, 24 Mar 2016 03:08:40 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2O38dJk012583;
 Thu, 24 Mar 2016 03:08:39 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2O38dnq012582;
 Thu, 24 Mar 2016 03:08:39 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603240308.u2O38dnq012582@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 24 Mar 2016 03:08:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297222 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Mar 2016 03:08:40 -0000

Author: bdrewery
Date: Thu Mar 24 03:08:39 2016
New Revision: 297222
URL: https://svnweb.freebsd.org/changeset/base/297222

Log:
  Fix M_RTABLE memory leak from r274118 (11/2014).
  
  Replace free(M_RTABLE) with rn_detachhead() to match rn_inithead().
  
  This would trigger when reloading NFS exports and was similar to
  problems with pf reload [1].
  
  PR:		194078 [1]
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/kern/vfs_export.c

Modified: head/sys/kern/vfs_export.c
==============================================================================
--- head/sys/kern/vfs_export.c	Thu Mar 24 02:15:23 2016	(r297221)
+++ head/sys/kern/vfs_export.c	Thu Mar 24 03:08:39 2016	(r297222)
@@ -259,7 +259,7 @@ vfs_free_addrlist_af(struct radix_node_h
 	(*rnh->rnh_walktree)(&rnh->rh, vfs_free_netcred, &rnh->rh);
 	RADIX_NODE_HEAD_UNLOCK(rnh);
 	RADIX_NODE_HEAD_DESTROY(rnh);
-	free(rnh, M_RTABLE);
+	rn_detachhead((void **)prnh);
 	prnh = NULL;
 }