From owner-svn-src-all@FreeBSD.ORG  Thu Oct 24 05:01:49 2013
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 ESMTP id BC90E402;
 Thu, 24 Oct 2013 05:01:49 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A90AD28F0;
 Thu, 24 Oct 2013 05:01:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O51nPn011293;
 Thu, 24 Oct 2013 05:01:49 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O51nu7011292;
 Thu, 24 Oct 2013 05:01:49 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201310240501.r9O51nu7011292@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 24 Oct 2013 05:01:49 +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: r257039 - stable/10/lib/libc/iconv
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.14
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: Thu, 24 Oct 2013 05:01:49 -0000

Author: delphij
Date: Thu Oct 24 05:01:49 2013
New Revision: 257039
URL: http://svnweb.freebsd.org/changeset/base/257039

Log:
  MFC r256833:
  
  Drop cm_lock before calling mapper_close, which in turn could call
  _citrus_mapper_close again and result in a deadlock otherwise.
  
  This is similar to NetBSD PR/24023 (fixed in their r1.5 of this file).
  
  PR:		bin/182994
  Submitted by:	Fabian Keil <fk fabiankeil de>
  Approved by:	re (hrs)

Modified:
  stable/10/lib/libc/iconv/citrus_mapper.c
Directory Properties:
  stable/10/lib/libc/   (props changed)

Modified: stable/10/lib/libc/iconv/citrus_mapper.c
==============================================================================
--- stable/10/lib/libc/iconv/citrus_mapper.c	Thu Oct 24 03:36:39 2013	(r257038)
+++ stable/10/lib/libc/iconv/citrus_mapper.c	Thu Oct 24 05:01:49 2013	(r257039)
@@ -381,7 +381,9 @@ _citrus_mapper_close(struct _citrus_mapp
 			_CITRUS_HASH_REMOVE(cm, cm_entry);
 			free(cm->cm_key);
 		}
+		UNLOCK(&cm_lock);
 		mapper_close(cm);
+		return;
 quit:
 		UNLOCK(&cm_lock);
 	}