Security-55179.1.tar.gz

[apple/security.git] / libsecurity_cdsa_client / lib / cssmclient.cpp

diff --git a/libsecurity_cdsa_client/lib/cssmclient.cpp b/libsecurity_cdsa_client/lib/cssmclient.cpp
index ec3fb44da7ff99b5e6e3179b95592f54ae28493f..a86f3bdec1d78a49e49863bbe742dcefe401fd25 100644 (file)
--- a/libsecurity_cdsa_client/lib/cssmclient.cpp
+++ b/libsecurity_cdsa_client/lib/cssmclient.cpp
@@ -193,6 +193,7 @@ CssmImpl::standard()
 void
 CssmImpl::activate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (!mActive)
        {
                // currently, no choices on PVC mode and key hierarchy
@@ -213,6 +214,7 @@ CssmImpl::activate()
 void
 CssmImpl::deactivate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (mActive)
        {
                mActive = false;
@@ -396,6 +398,7 @@ ModuleImpl::appNotifyCallback(RawModuleEvents *handler)
 void
 ModuleImpl::activate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (!mActive)
        {
                session()->init();
@@ -411,6 +414,7 @@ ModuleImpl::activate()
 void
 ModuleImpl::deactivate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (!isIdle())
                Error::throwMe(Error::objectBusy);
        if (mActive)
@@ -463,6 +467,7 @@ AttachmentImpl::make(CSSM_SERVICE_TYPE subserviceType)
 void
 AttachmentImpl::activate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (!mActive)
        {
                module()->load();
@@ -483,6 +488,7 @@ AttachmentImpl::activate()
 void
 AttachmentImpl::deactivate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (mActive)
        {
                mActive = false;