This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
8293044: C1: Missing access check on non-accessible class
Backport-of: 005b49bb78a468d4e372e6f5fa48bb0db4fd73c2
- Loading branch information
1 parent
e8a134a
commit 6b9fe5d
Showing
8 changed files
with
244 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| package compiler/c1; | ||
|
|
||
| super public class KlassAccessCheck | ||
| version 51:0 | ||
| { | ||
|
|
||
| public static Method testNewInstance:"()V" | ||
| stack 2 locals 0 | ||
| { | ||
| new class compiler/c1/types/PackagePrivateClass; | ||
| return; | ||
| } | ||
|
|
||
|
|
||
| public static Method testNewArray:"()[Ljava/lang/Object;" | ||
| stack 1 locals 0 | ||
| { | ||
| iconst_1; | ||
| anewarray class compiler/c1/types/PackagePrivateClass; | ||
| areturn; | ||
| } | ||
|
|
||
| public static Method testMultiNewArray:"()[[Ljava/lang/Object;" | ||
| stack 2 locals 1 | ||
| { | ||
| iconst_1; | ||
| iconst_1; | ||
| multianewarray class "[[Lcompiler/c1/types/PackagePrivateClass;", 2; | ||
| areturn; | ||
| } | ||
|
|
||
| public static Method testCheckCast:"(Ljava/lang/Object;)Ljava/lang/Object;" | ||
| stack 1 locals 2 | ||
| { | ||
| aload_0; | ||
| checkcast class compiler/c1/types/PackagePrivateClass; | ||
| areturn; | ||
| } | ||
|
|
||
| public static Method testCheckCastArr:"(Ljava/lang/Object;)Ljava/lang/Object;" | ||
| stack 1 locals 2 | ||
| { | ||
| aload_0; | ||
| checkcast class "[Lcompiler/c1/types/PackagePrivateClass;"; | ||
| areturn; | ||
| } | ||
|
|
||
| public static Method testInstanceOf:"(Ljava/lang/Object;)Z" | ||
| stack 1 locals 2 | ||
| { | ||
| aload_0; | ||
| instanceof class compiler/c1/types/PackagePrivateClass; | ||
| ireturn; | ||
| } | ||
|
|
||
| public static Method testInstanceOfArr:"(Ljava/lang/Object;)Z" | ||
| stack 1 locals 2 | ||
| { | ||
| aload_0; | ||
| instanceof class "[Lcompiler/c1/types/PackagePrivateClass;"; | ||
| ireturn; | ||
| } | ||
| } // end Class KlassAccessCheck |
29 changes: 29 additions & 0 deletions
29
test/hotspot/jtreg/compiler/c1/KlassAccessCheckPackagePrivate.jasm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| package compiler/c1/types; | ||
|
|
||
| super class PackagePrivateClass | ||
| version 51:0 | ||
| {} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8293044 | ||
| * @requires vm.compiler1.enabled | ||
| * @compile KlassAccessCheckPackagePrivate.jasm | ||
| * @compile KlassAccessCheck.jasm | ||
| * @run main/othervm -Xbatch -XX:TieredStopAtLevel=1 compiler.c1.KlassAccessCheckTest | ||
| */ | ||
|
|
||
| package compiler.c1; | ||
|
|
||
| public class KlassAccessCheckTest { | ||
| static void test(Runnable r) { | ||
| for (int i = 0; i < 1000; ++i) { | ||
| try { | ||
| r.run(); | ||
| throw new AssertionError("No IllegalAccessError thrown"); | ||
| } catch (IllegalAccessError e) { | ||
| // Expected | ||
| } catch (AssertionError e) { | ||
| throw e; // rethrow | ||
| } catch (Throwable e) { | ||
| throw new AssertionError("Wrong exception thrown", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static void main(String[] args) { | ||
| test(() -> KlassAccessCheck.testNewInstance()); | ||
| test(() -> KlassAccessCheck.testNewArray()); | ||
| test(() -> KlassAccessCheck.testMultiNewArray()); | ||
| test(() -> KlassAccessCheck.testCheckCast(42)); | ||
| test(() -> KlassAccessCheck.testCheckCastArr(new Integer[0])); | ||
| test(() -> KlassAccessCheck.testInstanceOf(42)); | ||
| test(() -> KlassAccessCheck.testInstanceOfArr(new Integer[0])); | ||
| System.out.println("TEST PASSED"); | ||
| } | ||
| } |
6b9fe5dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues