8293232: Fix race condition in pkcs11 SessionManager

Reviewed-by: valeriep
openjdk · Sep 7, 2022 · 1e031e6 · 1e031e6 · openjdk-notifier · Sep 7, 2022
1 parent 1080c4e
commit 1e031e6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,12 @@ void demoteObjSession(Session session) {
             // will be added to correct pool on release, nothing to do now
             return;
         }
-        opSessions.release(session);
+        // Objects could have been added to this session by other thread between
+        // check in Session.removeObject method and objSessions.remove call
+        // higher. Therefore releaseSession method, which performs additional
+        // check for objects, is used here to avoid placing this session
+        // in wrong pool due to race condition.
+        releaseSession(session);
     }
 
     private Session openSession() throws PKCS11Exception {