From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 4 Aug 2025 08:16:31 +0000 (+0200)
Subject: credential-factory: Avoid deadlock during unit tests
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2F2850-keygen-timeout;p=thirdparty%2Fstrongswan.git

credential-factory: Avoid deadlock during unit tests

If a unit test times out while generating a private key (e.g. because of
a lack of entropy), this avoids a deadlock by still releasing the read
lock that'd prevent acquiring the write lock when plugins are unloaded.
---

diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c
index 1fa34192d8..07e1de76e8 100644
--- a/src/libstrongswan/credentials/credential_factory.c
+++ b/src/libstrongswan/credentials/credential_factory.c
@@ -140,6 +140,8 @@ METHOD(credential_factory_t, create, void*,
 	this->recursive->set(this->recursive, (void*)level + 1);
 
 	this->lock->read_lock(this->lock);
+	/* push this in case of a timeout during unit tests */
+	thread_cleanup_push((thread_cleanup_t)this->lock->unlock, this->lock);
 	enumerator = this->constructors->create_enumerator(this->constructors);
 	while (enumerator->enumerate(enumerator, &entry))
 	{
@@ -159,7 +161,7 @@ METHOD(credential_factory_t, create, void*,
 		}
 	}
 	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
+	thread_cleanup_pop(TRUE);
 
 	if (!construct && !level)
 	{