ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'fix-lock-order-reversal-v9_12' into 'v9_12'

Browse Source 
fix lock order reversal

See merge request isc-projects/bind9!666
This commit is contained in:
Mark Andrews
2018-08-20 23:40:28 -04:00
parent cd75073105 f00e73874d
commit a544caec90
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,3 +1,5 @@
5012. [bug] Fix lock order reversal in pk11_initialize. [GL !590]
5009. [bug] Upon an OpenSSL failure, the first error in the OpenSSL
error queue was not logged. [GL #476]
lib/isc/pk11.c
+4 -6
View File
@@ -185,21 +185,20 @@ pk11_mem_put(void *ptr, size_t size) {
isc_result_t
pk11_initialize(isc_mem_t *mctx, const char *engine) {
isc_result_t result;
isc_result_t result = ISC_R_SUCCESS;
CK_RV rv;
RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS);
LOCK(&sessionlock);
LOCK(&alloclock);
if ((mctx != NULL) && (pk11_mctx == NULL) && (allocsize == 0))
isc_mem_attach(mctx, &pk11_mctx);
UNLOCK(&alloclock);
if (initialized) {
UNLOCK(&alloclock);
return (ISC_R_SUCCESS);
goto unlock;
} else {
LOCK(&sessionlock);
initialized = true;
UNLOCK(&alloclock);
}
ISC_LIST_INIT(tokens);
@@ -239,7 +238,6 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
}
#endif
#endif /* PKCS11CRYPTO */
result = ISC_R_SUCCESS;
unlock:
UNLOCK(&sessionlock);
return (result);