archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reviewed-by: alanb
This commit is contained in:
Andrey Turbanov 2022-09-07 06:11:56 +00:00
parent 205f992e9e
commit 2259e427a5
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
View file

@ -108,12 +108,14 @@ public class SharedSecrets {
} }
public static JavaUtilConcurrentTLRAccess getJavaUtilConcurrentTLRAccess() { public static JavaUtilConcurrentTLRAccess getJavaUtilConcurrentTLRAccess() {
if (javaUtilConcurrentTLRAccess == null) { var access = javaUtilConcurrentTLRAccess;
if (access == null) {
try { try {
Class.forName("java.util.concurrent.ThreadLocalRandom$Access", true, null); Class.forName("java.util.concurrent.ThreadLocalRandom$Access", true, null);
access = javaUtilConcurrentTLRAccess;
} catch (ClassNotFoundException e) {} } catch (ClassNotFoundException e) {}
} }
return javaUtilConcurrentTLRAccess; return access;
} }
public static void setJavaUtilConcurrentFJPAccess(JavaUtilConcurrentFJPAccess access) { public static void setJavaUtilConcurrentFJPAccess(JavaUtilConcurrentFJPAccess access) {
@ -121,10 +123,12 @@ public class SharedSecrets {
} }
public static JavaUtilConcurrentFJPAccess getJavaUtilConcurrentFJPAccess() { public static JavaUtilConcurrentFJPAccess getJavaUtilConcurrentFJPAccess() {
if (javaUtilConcurrentFJPAccess == null) { var access = javaUtilConcurrentFJPAccess;
if (access == null) {
ensureClassInitialized(ForkJoinPool.class); ensureClassInitialized(ForkJoinPool.class);
access = javaUtilConcurrentFJPAccess;
} }
return javaUtilConcurrentFJPAccess; return access;
} }
public static JavaUtilJarAccess javaUtilJarAccess() { public static JavaUtilJarAccess javaUtilJarAccess() {
@ -463,10 +467,12 @@ public class SharedSecrets {
} }
public static JavaSecuritySpecAccess getJavaSecuritySpecAccess() { public static JavaSecuritySpecAccess getJavaSecuritySpecAccess() {
if (javaSecuritySpecAccess == null) { var access = javaSecuritySpecAccess;
if (access == null) {
ensureClassInitialized(EncodedKeySpec.class); ensureClassInitialized(EncodedKeySpec.class);
access = javaSecuritySpecAccess;
} }
return javaSecuritySpecAccess; return access;
} }
public static void setJavaxCryptoSpecAccess(JavaxCryptoSpecAccess jcsa) { public static void setJavaxCryptoSpecAccess(JavaxCryptoSpecAccess jcsa) {
@ -474,10 +480,12 @@ public class SharedSecrets {
} }
public static JavaxCryptoSpecAccess getJavaxCryptoSpecAccess() { public static JavaxCryptoSpecAccess getJavaxCryptoSpecAccess() {
if (javaxCryptoSpecAccess == null) { var access = javaxCryptoSpecAccess;
if (access == null) {
ensureClassInitialized(SecretKeySpec.class); ensureClassInitialized(SecretKeySpec.class);
access = javaxCryptoSpecAccess;
} }
return javaxCryptoSpecAccess; return access;
} }
public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAccess jcsoa) { public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAccess jcsoa) {