From owner-svn-src-all@FreeBSD.ORG  Tue Sep 16 21:26:25 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 56B56348;
 Tue, 16 Sep 2014 21:26:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 41C5FE44;
 Tue, 16 Sep 2014 21:26:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8GLQPm3097600;
 Tue, 16 Sep 2014 21:26:25 GMT (envelope-from lstewart@FreeBSD.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8GLQP1C097599;
 Tue, 16 Sep 2014 21:26:25 GMT (envelope-from lstewart@FreeBSD.org)
Message-Id: <201409162126.s8GLQP1C097599@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: lstewart set sender to
 lstewart@FreeBSD.org using -f
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Tue, 16 Sep 2014 21:26:25 +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: r271690 - stable/10/sys/netinet/cc
X-SVN-Group: stable-10
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.18-1
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Sep 2014 21:26:25 -0000

Author: lstewart
Date: Tue Sep 16 21:26:24 2014
New Revision: 271690
URL: http://svnweb.freebsd.org/changeset/base/271690

Log:
  MFC r270160:
  
  Destroy the "qdiffsample_zone" UMA zone on unload to avoid a use-after-unload
  panic easily triggered by running "sysctl -a" after unload.
  
  Reported and tested by:	Grenville Armitage <garmitage@swin.edu.au>
  Approved by:	re(gjb)

Modified:
  stable/10/sys/netinet/cc/cc_cdg.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/cc/cc_cdg.c
==============================================================================
--- stable/10/sys/netinet/cc/cc_cdg.c	Tue Sep 16 20:48:13 2014	(r271689)
+++ stable/10/sys/netinet/cc/cc_cdg.c	Tue Sep 16 21:26:24 2014	(r271690)
@@ -221,6 +221,7 @@ static VNET_DEFINE(uint32_t, cdg_hold_ba
 
 /* Function prototypes. */
 static int cdg_mod_init(void);
+static int cdg_mod_destroy(void);
 static void cdg_conn_init(struct cc_var *ccv);
 static int cdg_cb_init(struct cc_var *ccv);
 static void cdg_cb_destroy(struct cc_var *ccv);
@@ -234,7 +235,8 @@ struct cc_algo cdg_cc_algo = {
 	.cb_destroy = cdg_cb_destroy,
 	.cb_init = cdg_cb_init,
 	.conn_init = cdg_conn_init,
-	.cong_signal = cdg_cong_signal
+	.cong_signal = cdg_cong_signal,
+	.mod_destroy = cdg_mod_destroy
 };
 
 /* Vnet created and being initialised. */
@@ -278,6 +280,14 @@ cdg_mod_init(void)
 }
 
 static int
+cdg_mod_destroy(void)
+{
+
+	uma_zdestroy(qdiffsample_zone);
+	return (0);
+}
+
+static int
 cdg_cb_init(struct cc_var *ccv)
 {
 	struct cdg *cdg_data;