unlink before unlock

(cherry picked from commit 4742f4ecba886c94fb925c1bab6d14e81295ce82)

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index 45075df7db40067f1487622152a5d807889e713f..fd6d7fe04fba649361808bdb80505334a8bc05a1 100644 (file)
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -515,6 +515,7 @@ free_session_list(pk11_sessionlist_t *slist) {
        LOCK(&sessionlock);
        while (!ISC_LIST_EMPTY(*slist)) {
                sp = ISC_LIST_HEAD(*slist);
+               ISC_LIST_UNLINK(*slist, sp, link);
                UNLOCK(&sessionlock);
                if (sp->session != CK_INVALID_HANDLE) {
                        rv = pkcs_C_CloseSession(sp->session);
@@ -522,7 +523,6 @@ free_session_list(pk11_sessionlist_t *slist) {
                                ret = DST_R_CRYPTOFAILURE;
                }
                LOCK(&sessionlock);
-               ISC_LIST_UNLINK(*slist, sp, link);
                pk11_mem_put(sp, sizeof(*sp));
        }
        UNLOCK(&sessionlock);