mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

fix lock order reversal

Browse Source
This commit is contained in:
Mark Andrews
2018-08-02 15:34:31 +10:00
parent bf98eb41bf
commit 2bb4392bb3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/isc/pk11.c
View File

@@ -182,21 +182,20 @@ pk11_mem_put(void *ptr, size_t size) {
isc_result_t isc_result_t
pk11_initialize(isc_mem_t *mctx, const char *engine) { pk11_initialize(isc_mem_t *mctx, const char *engine) {
isc_result_t result; isc_result_t result = ISC_R_SUCCESS;
CK_RV rv; CK_RV rv;
RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS);
LOCK(&sessionlock);
LOCK(&alloclock); LOCK(&alloclock);
if ((mctx != NULL) && (pk11_mctx == NULL) && (allocsize == 0)) if ((mctx != NULL) && (pk11_mctx == NULL) && (allocsize == 0))
isc_mem_attach(mctx, &pk11_mctx); isc_mem_attach(mctx, &pk11_mctx);
UNLOCK(&alloclock);
if (initialized) { if (initialized) {
UNLOCK(&alloclock); goto unlock;
return (ISC_R_SUCCESS);
} else { } else {
LOCK(&sessionlock);
initialized = true; initialized = true;
UNLOCK(&alloclock);
} }
ISC_LIST_INIT(tokens); ISC_LIST_INIT(tokens);
@@ -220,7 +219,6 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) {
} }
scan_slots(); scan_slots();
result = ISC_R_SUCCESS;
unlock: unlock:
UNLOCK(&sessionlock); UNLOCK(&sessionlock);
return (result); return (result);