Merge pull request #10787 from JasonFengJ9/v0.23-smcheck

(v0.23.0-release) Add security check at System.loadLibrary(libName)
eclipse-openj9 · Oct 9, 2020 · 3bf8762 · 3bf8762
2 parents 2490f2f + 2dc151c
commit 3bf8762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/ClassLoader.java b/jcl/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -1913,9 +1913,6 @@ static ClassLoader callerClassLoader() {
  *							if the library was not allowed to be loaded
  */
 static void loadLibraryWithClassLoader(String libName, ClassLoader loader) {
-	SecurityManager smngr = System.getSecurityManager();
-	if (smngr != null)
-		smngr.checkLink(libName);
 	if (loader != null) {
 		String realLibName = loader.findLibrary(libName);
 

diff --git a/jcl/src/java.base/share/classes/java/lang/System.java b/jcl/src/java.base/share/classes/java/lang/System.java
@@ -750,6 +750,10 @@ public static void load(String pathName) {
  */
 @CallerSensitive
 public static void loadLibrary(String libName) {
+	SecurityManager smngr = System.getSecurityManager();
+	if (smngr != null) {
+		smngr.checkLink(libName);
+	}
 /*[IF Java15]*/
 	ClassLoader.loadLibrary(getCallerClass(), libName);
 /*[ELSE]*/