Remove lockless peak from sessions managment

We will always pay the price of a lock, but this is the more robust thing to do for now. Fixes: CID 468681 CID 468678 Signed-off-by: Simo Sorce <[email protected]>
simo5 · Nov 28, 2023 · 2e2c187 · 2e2c187
1 parent d5aeab4
commit 2e2c187
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/session.c b/src/session.c
@@ -957,22 +957,16 @@ void p11prov_return_session(P11PROV_SESSION *session)
     pool = session->pool;
 
     if (pool) {
-        /* peek at the pool lockless worst case we waste some time */
-        if (pool->open_sessions >= pool->max_cached_sessions) {
-            /* not much we can do if this fails,
-             * but only accounting will be a bit off */
-
-            /* LOCKED SECTION ------------- */
-            if (MUTEX_LOCK(pool) == CKR_OK) {
-                if (pool->open_sessions >= pool->max_cached_sessions
-                    && session != pool->login_session) {
-                    token_session_close(session);
-                    pool->open_sessions--;
-                }
-                (void)MUTEX_UNLOCK(pool);
+        /* LOCKED SECTION ------------- */
+        if (MUTEX_LOCK(pool) == CKR_OK) {
+            if (pool->open_sessions >= pool->max_cached_sessions
+                && session != pool->login_session) {
+                token_session_close(session);
+                pool->open_sessions--;
             }
-            /* ------------- LOCKED SECTION */
+            (void)MUTEX_UNLOCK(pool);
         }
+        /* ------------- LOCKED SECTION */
     }
 
     ret = MUTEX_LOCK(session);