8293197: Avoid double racy reads from non-volatile fields in SharedSe…

…crets Reviewed-by: alanb
openjdk · Sep 7, 2022 · 2259e42 · 2259e42 · openjdk-notifier · Sep 7, 2022
1 parent 205f992
commit 2259e42
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -108,23 +108,27 @@ public static void setJavaUtilConcurrentTLRAccess(JavaUtilConcurrentTLRAccess ac
     }
 
     public static JavaUtilConcurrentTLRAccess getJavaUtilConcurrentTLRAccess() {
-        if (javaUtilConcurrentTLRAccess == null) {
+        var access = javaUtilConcurrentTLRAccess;
+        if (access == null) {
             try {
                 Class.forName("java.util.concurrent.ThreadLocalRandom$Access", true, null);
+                access = javaUtilConcurrentTLRAccess;
             } catch (ClassNotFoundException e) {}
         }
-        return javaUtilConcurrentTLRAccess;
+        return access;
     }
 
     public static void setJavaUtilConcurrentFJPAccess(JavaUtilConcurrentFJPAccess access) {
         javaUtilConcurrentFJPAccess = access;
     }
 
     public static JavaUtilConcurrentFJPAccess getJavaUtilConcurrentFJPAccess() {
-        if (javaUtilConcurrentFJPAccess == null) {
+        var access = javaUtilConcurrentFJPAccess;
+        if (access == null) {
             ensureClassInitialized(ForkJoinPool.class);
+            access = javaUtilConcurrentFJPAccess;
         }
-        return javaUtilConcurrentFJPAccess;
+        return access;
     }
 
     public static JavaUtilJarAccess javaUtilJarAccess() {
@@ -463,21 +467,25 @@ public static void setJavaSecuritySpecAccess(JavaSecuritySpecAccess jssa) {
     }
 
     public static JavaSecuritySpecAccess getJavaSecuritySpecAccess() {
-        if (javaSecuritySpecAccess == null) {
+        var access = javaSecuritySpecAccess;
+        if (access == null) {
             ensureClassInitialized(EncodedKeySpec.class);
+            access = javaSecuritySpecAccess;
         }
-        return javaSecuritySpecAccess;
+        return access;
     }
 
     public static void setJavaxCryptoSpecAccess(JavaxCryptoSpecAccess jcsa) {
         javaxCryptoSpecAccess = jcsa;
     }
 
     public static JavaxCryptoSpecAccess getJavaxCryptoSpecAccess() {
-        if (javaxCryptoSpecAccess == null) {
+        var access = javaxCryptoSpecAccess;
+        if (access == null) {
             ensureClassInitialized(SecretKeySpec.class);
+            access = javaxCryptoSpecAccess;
         }
-        return javaxCryptoSpecAccess;
+        return access;
     }
 
     public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAccess jcsoa) {