From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 20 Mar 2015 23:13:51 +0000 (+0800)
Subject: auth: use crypto_init_mutex to protect NSS_Shutdown()
X-Git-Tag: v0.94.4~29^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f542aa2410139bece0f4192079e4e34260da782;p=ceph.git

auth: use crypto_init_mutex to protect NSS_Shutdown()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit cf058174fe6be26129eb52f4fb24d0f7146ef7af)
---

diff --git a/src/common/ceph_crypto.cc b/src/common/ceph_crypto.cc
index 9ba29455d334a..eb46672b917a8 100644
--- a/src/common/ceph_crypto.cc
+++ b/src/common/ceph_crypto.cc
@@ -67,9 +67,11 @@ void ceph::crypto::init(CephContext *cct)
 void ceph::crypto::shutdown()
 {
   SECStatus s;
+  pthread_mutex_lock(&crypto_init_mutex);
   s = NSS_Shutdown();
   assert(s == SECSuccess);
   crypto_init_pid = 0;
+  pthread_mutex_unlock(&crypto_init_mutex);
 }
 
 ceph::crypto::HMACSHA1::~HMACSHA1()