Merge pull request softhsm#517 from halderen/closememleak

Memory leak upon clearing resources or unloading
middagj · Feb 24, 2020 · 80b96a9 · 80b96a9
2 parents 2b9768a + 37d2f9b
commit 80b96a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
@@ -344,10 +344,17 @@ SoftHSM* SoftHSM::i()
 	if (!instance.get())
 	{
 		instance.reset(new SoftHSM());
-	} else if(instance->detectFork())
+	}
+	else if(instance->detectFork())
 	{
 		if (Configuration::i()->getBool("library.reset_on_fork", false))
 		{
+			/* It is important to first clear the singleton
+			 * instance, and then fill it again, so make sure
+			 * the old instance is first destroyed as some
+			 * static structures are erased in the destructor.
+			 */
+			instance.reset(NULL);
 			instance.reset(new SoftHSM());
 		}
 	}
@@ -393,14 +400,12 @@ SoftHSM::~SoftHSM()
 	if (sessionObjectStore != NULL) delete sessionObjectStore;
 	sessionObjectStore = NULL;
 
+	mechanisms_table.clear();
+	supportedMechanisms.clear();
+
 	resetMutexFactoryCallbacks();
 }
 
-// A list with the supported mechanisms
-std::map<std::string, CK_MECHANISM_TYPE> mechanisms_table;
-std::list<CK_MECHANISM_TYPE> supportedMechanisms;
-CK_ULONG nrSupportedMechanisms;
-
 /*****************************************************************************
  Implementation of PKCS #11 functions
  *****************************************************************************/

diff --git a/src/lib/SoftHSM.h b/src/lib/SoftHSM.h
@@ -193,6 +193,11 @@ class SoftHSM
 	SessionManager* sessionManager;
 	HandleManager* handleManager;
 
+	// A list with the supported mechanisms
+	std::map<std::string, CK_MECHANISM_TYPE> mechanisms_table;
+	std::list<CK_MECHANISM_TYPE> supportedMechanisms;
+	CK_ULONG nrSupportedMechanisms;
+
 	int forkID;
 
 	// Encrypt/Decrypt variants
@@ -478,9 +483,8 @@ class SoftHSM
 
 	CK_RV MechParamCheckRSAPKCSOAEP(CK_MECHANISM_PTR pMechanism);
 
-	static bool isMechanismPermitted(OSObject* key, CK_MECHANISM_PTR pMechanism);
-	static void prepareSupportedMecahnisms(std::map<std::string, CK_MECHANISM_TYPE> &t);
-
+	bool isMechanismPermitted(OSObject* key, CK_MECHANISM_PTR pMechanism);
+	void prepareSupportedMecahnisms(std::map<std::string, CK_MECHANISM_TYPE> &t);
 	bool detectFork(void);
 };