archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8222895: StackOverflowError in custom security manager that relies on ClassSpecializer

Browse source 
Reviewed-by: alanb
This commit is contained in:
Claes Redestad 2019-05-02 10:38:00 +02:00
parent b3f4ca4563
commit c23dc4dfcf
3 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
View file

@ -72,6 +72,8 @@ public class HelloClasslist {
String SC = String.valueOf(args.length) + "string"; String SC = String.valueOf(args.length) + "string";
String SCS = String.valueOf(args.length) + "string" + String.valueOf(args.length); String SCS = String.valueOf(args.length) + "string" + String.valueOf(args.length);
String CSS = "string" + String.valueOf(args.length) + String.valueOf(args.length); String CSS = "string" + String.valueOf(args.length) + String.valueOf(args.length);
String CSC = "string" + String.valueOf(args.length) + "string";
String SSC = String.valueOf(args.length) + String.valueOf(args.length) + "string";
String CSCS = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length); String CSCS = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length);
String SCSC = String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string"; String SCSC = String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string";
String CSCSC = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string"; String CSCSC = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string";

28
src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
View file

@ -25,6 +25,7 @@
package java.lang.invoke; package java.lang.invoke;
import jdk.internal.access.SharedSecrets;
import jdk.internal.loader.BootLoader; import jdk.internal.loader.BootLoader;
import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.FieldVisitor; import jdk.internal.org.objectweb.asm.FieldVisitor;
@ -37,6 +38,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -575,19 +577,19 @@ abstract class ClassSpecializer<T,K,S extends ClassSpecializer<T,K,S>.SpeciesDat
// load class // load class
InvokerBytecodeGenerator.maybeDump(classBCName(className), classFile); InvokerBytecodeGenerator.maybeDump(classBCName(className), classFile);
Class<?> speciesCode; ClassLoader cl = topClass.getClassLoader();
ProtectionDomain pd = null;
MethodHandles.Lookup lookup = IMPL_LOOKUP.in(topClass()); if (cl != null) {
speciesCode = AccessController.doPrivileged(new PrivilegedAction<>() { pd = AccessController.doPrivileged(
@Override new PrivilegedAction<>() {
public Class<?> run() { @Override
try { public ProtectionDomain run() {
return lookup.defineClass(classFile); return topClass().getProtectionDomain();
} catch (Exception ex) { }
throw newInternalError(ex); });
} }
} Class<?> speciesCode = SharedSecrets.getJavaLangAccess()
}); .defineClass(cl, className, classFile, pd, "_ClassSpecializer_generateConcreteSpeciesCode");
return speciesCode.asSubclass(topClass()); return speciesCode.asSubclass(topClass());
} }

26
test/jdk/java/lang/String/concat/WithSecurityManager.java
View file

@ -26,7 +26,7 @@ import java.security.Permission;
/** /**
* @test * @test
* @summary String concatenation fails with a custom SecurityManager that uses concatenation * @summary String concatenation fails with a custom SecurityManager that uses concatenation
* @bug 8155090 8158851 * @bug 8155090 8158851 8222895
* @requires !vm.graal.enabled * @requires !vm.graal.enabled
* *
* @compile WithSecurityManager.java * @compile WithSecurityManager.java
@ -55,12 +55,17 @@ public class WithSecurityManager {
@Override @Override
public void checkPermission(Permission perm) { public void checkPermission(Permission perm) {
String abc = "abc"; String abc = "abc";
String full = abc + "def"; int ival = perm.hashCode();
String full = abc + "abc";
// Contorted to avoid sweeping cases where we've
// pre-generated commonly used species under the rug
full = "abc" + ival + "def" + abc + "def" + abc + "def" +
abc + "def" + ival + "def" + abc + "def" +
abc + "def" + abc + "def" + abc + "def";
} }
}; };
System.setSecurityManager(sm); System.setSecurityManager(sm);
ClassLoader cl = new ClassLoader() { ClassLoader cl = new ClassLoader() {};
};
} }
// Second time should succeed to run after bootstrapping // Second time should succeed to run after bootstrapping
@ -69,12 +74,19 @@ public class WithSecurityManager {
@Override @Override
public void checkPermission(Permission perm) { public void checkPermission(Permission perm) {
String abc = "abc"; String abc = "abc";
String full = abc + "def"; int ival = perm.hashCode();
String full = abc + "abc";
// Contorted variant to avoid sweeping cases where we've
// pre-generated commonly used species under the rug
full = "abc" + ival + "def" + abc + "def" + abc + "def" +
abc + "def" + ival + "def" + abc + "def" +
abc + "def" + abc + "def" + abc + "def";
} }
}; };
// Provoke checkPermission invocation
System.setSecurityManager(sm); System.setSecurityManager(sm);
ClassLoader cl = new ClassLoader() { ClassLoader cl = new ClassLoader() {};
};
} }
} }
} }