From owner-svn-src-head@freebsd.org  Tue Jul 11 17:59:16 2017
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 8CDB4DA8D42;
 Tue, 11 Jul 2017 17:59:16 +0000 (UTC)
 (envelope-from markj@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 5B4ED801D8;
 Tue, 11 Jul 2017 17:59:16 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6BHxFVq008325;
 Tue, 11 Jul 2017 17:59:15 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6BHxFnH008324;
 Tue, 11 Jul 2017 17:59:15 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201707111759.v6BHxFnH008324@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 11 Jul 2017 17:59:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320895 - head/lib/libc/net
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/lib/libc/net
X-SVN-Commit-Revision: 320895
X-SVN-Commit-Repository: base
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.23
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, 11 Jul 2017 17:59:16 -0000

Author: markj
Date: Tue Jul 11 17:59:15 2017
New Revision: 320895
URL: https://svnweb.freebsd.org/changeset/base/320895

Log:
  Don't dlclose NSS modules from nss_atexit().
  
  As hinted in the commit log message for r259042, this is unnecessary.
  Moreover, as a result of that change we may invoke a DSO's atexit handler
  after it has been unmapped.
  
  Reviewed by:	bdrewery, cem
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/libc/net/nsdispatch.c

Modified: head/lib/libc/net/nsdispatch.c
==============================================================================
--- head/lib/libc/net/nsdispatch.c	Tue Jul 11 16:30:16 2017	(r320894)
+++ head/lib/libc/net/nsdispatch.c	Tue Jul 11 17:59:15 2017	(r320895)
@@ -525,8 +525,8 @@ fin:
 	vector_sort(_nsmod, _nsmodsize, sizeof(*_nsmod), string_compare);
 }
 
+static int exiting = 0;
 
-
 static void
 ns_mod_free(ns_mod *mod)
 {
@@ -536,12 +536,10 @@ ns_mod_free(ns_mod *mod)
 		return;
 	if (mod->unregister != NULL)
 		mod->unregister(mod->mtab, mod->mtabsize);
-	if (mod->handle != nss_builtin_handle)
+	if (mod->handle != nss_builtin_handle && !exiting)
 		(void)dlclose(mod->handle);
 }
 
-
-
 /*
  * Cleanup
  */
@@ -550,6 +548,7 @@ nss_atexit(void)
 {
 	int isthreaded;
 
+	exiting = 1;
 	isthreaded = __isthreaded;
 	if (isthreaded)
 		(void)_pthread_rwlock_wrlock(&nss_lock);
@@ -560,8 +559,6 @@ nss_atexit(void)
 	if (isthreaded)
 		(void)_pthread_rwlock_unlock(&nss_lock);
 }
-
-
 
 /*
  * Finally, the actual implementation.