From fffab58da85dfb88fe6dc70ab603b2d29b41cc1b Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 4 Dec 2013 23:20:35 +0000 Subject: Add multiple security patches and improvements from IcedTea6. http://icedtea.classpath.org/hg/icedtea6/rev/e98b0ef70b26 Obtained from: IcedTea Project --- .../openjdk/8012243-serial_regression.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 java/openjdk6/files/icedtea/openjdk/8012243-serial_regression.patch (limited to 'java/openjdk6/files/icedtea/openjdk/8012243-serial_regression.patch') diff --git a/java/openjdk6/files/icedtea/openjdk/8012243-serial_regression.patch b/java/openjdk6/files/icedtea/openjdk/8012243-serial_regression.patch new file mode 100644 index 000000000000..1cffb35a587b --- /dev/null +++ b/java/openjdk6/files/icedtea/openjdk/8012243-serial_regression.patch @@ -0,0 +1,45 @@ +# HG changeset patch +# User dfuchs +# Date 1367362161 -7200 +# Wed May 01 00:49:21 2013 +0200 +# Node ID 47c881c5439a4542b19ab85f376e94fc2c0a5a57 +# Parent 0bf55b4c8a7bbea02a9d848b2a5451adbd6a6ac4 +8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 +Reviewed-by: alanb, skoivu, smarks, mchung + +diff -r 0bf55b4c8a7b -r 47c881c5439a src/share/classes/java/io/ObjectStreamClass.java +--- jdk/src/share/classes/java/io/ObjectStreamClass.java Fri May 17 14:29:51 2013 -0700 ++++ jdk/src/share/classes/java/io/ObjectStreamClass.java Wed May 01 00:49:21 2013 +0200 +@@ -241,9 +241,11 @@ + if (cl == null) { + return null; + } +- Class caller = Reflection.getCallerClass(); +- if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) { +- ReflectUtil.checkPackageAccess(cl); ++ if (System.getSecurityManager() != null) { ++ Class caller = Reflection.getCallerClass(); ++ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) { ++ ReflectUtil.checkPackageAccess(cl); ++ } + } + return cl; + } +diff -r 0bf55b4c8a7b -r 47c881c5439a src/share/classes/java/io/ObjectStreamField.java +--- jdk/src/share/classes/java/io/ObjectStreamField.java Fri May 17 14:29:51 2013 -0700 ++++ jdk/src/share/classes/java/io/ObjectStreamField.java Wed May 01 00:49:21 2013 +0200 +@@ -162,9 +162,11 @@ + */ + @CallerSensitive + public Class getType() { +- Class caller = Reflection.getCallerClass(); +- if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) { +- ReflectUtil.checkPackageAccess(type); ++ if (System.getSecurityManager() != null) { ++ Class caller = Reflection.getCallerClass(); ++ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) { ++ ReflectUtil.checkPackageAccess(type); ++ } + } + return type; + } -- cgit v1.2.3