changeset 48841:78e9e31d5c52 nestmates

8197393: [Nestmates] Add missing NestHost attribute length check in classFileParser Reviewed-by: mchung
author dholmes
date Thu, 08 Feb 2018 21:12:21 -0500
parents f9f144c148ac
children 28145af98042
files src/hotspot/share/classfile/classFileParser.cpp test/hotspot/jtreg/runtime/Nestmates/classFileParsing/BadNestHostLength.jcod test/hotspot/jtreg/runtime/Nestmates/classFileParsing/TestNestmateAttributes.java
diffstat 3 files changed, 117 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/classfile/classFileParser.cpp	Tue Feb 06 06:45:09 2018 -0500
+++ b/src/hotspot/share/classfile/classFileParser.cpp	Thu Feb 08 21:12:21 2018 -0500
@@ -3492,6 +3492,9 @@
           if (parsed_nest_members_attribute) {
             classfile_parse_error("Conflicting NestMembers and NestHost attributes in class file %s", CHECK);
           }
+          if (_need_verify) {
+            guarantee_property(attribute_length == 2, "Wrong NestHost attribute length in class file %s", CHECK);
+          }
           cfs->guarantee_more(2, CHECK);
           u2 class_info_index = cfs->get_u2_fast();
           check_property(
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/Nestmates/classFileParsing/BadNestHostLength.jcod	Thu Feb 08 21:12:21 2018 -0500
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+/* Source: NestmateAttributeHolder.java
+
+public class NestmateAttributeHolder {
+    public static class BadNestHostLength {
+    }
+}
+*/
+
+// Declare NestHost attribute as variable-length > 2
+class NestmateAttributeHolder$BadNestHostLength {
+  0xCAFEBABE;
+  0; // minor version
+  55; // version
+  [] { // Constant Pool
+    ; // first element is empty
+    Method #3 #12; // #1
+    class #13; // #2
+    class #16; // #3
+    Utf8 "<init>"; // #4
+    Utf8 "()V"; // #5
+    Utf8 "Code"; // #6
+    Utf8 "LineNumberTable"; // #7
+    Utf8 "SourceFile"; // #8
+    Utf8 "NestmateAttributeHolder.java"; // #9
+    Utf8 "NestHost"; // #10
+    class #17; // #11
+    NameAndType #4 #5; // #12
+    Utf8 "NestmateAttributeHolder$BadNestHostLength"; // #13
+    Utf8 "BadNestHostLength"; // #14
+    Utf8 "InnerClasses"; // #15
+    Utf8 "java/lang/Object"; // #16
+    Utf8 "NestmateAttributeHolder"; // #17
+  } // Constant Pool
+
+  0x0021; // access
+  #2;// this_cpx
+  #3;// super_cpx
+
+  [] { // Interfaces
+  } // Interfaces
+
+  [] { // fields
+  } // fields
+
+  [] { // methods
+    { // Member
+      0x0001; // access
+      #4; // name_cpx
+      #5; // sig_cpx
+      [] { // Attributes
+        Attr(#6) { // Code
+          1; // max_stack
+          1; // max_locals
+          Bytes[]{
+            0x2AB70001B1;
+          };
+          [] { // Traps
+          } // end Traps
+          [] { // Attributes
+            Attr(#7) { // LineNumberTable
+              [] { // LineNumberTable
+                0  2;
+              }
+            } // end LineNumberTable
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+  } // methods
+
+  [] { // Attributes
+    Attr(#8) { // SourceFile
+      #9;
+    } // end SourceFile
+    ;
+    Attr(#10) { // NestHost
+      [] {
+        #11 #11 #11 #11;
+      }
+    } // end NestHost
+    ;
+    Attr(#15) { // InnerClasses
+      [] { // InnerClasses
+        #2 #11 #14 9;
+      }
+    } // end InnerClasses
+  } // Attributes
+} // end class NestmateAttributeHolder$BadNestHostLength
--- a/test/hotspot/jtreg/runtime/Nestmates/classFileParsing/TestNestmateAttributes.java	Tue Feb 06 06:45:09 2018 -0500
+++ b/test/hotspot/jtreg/runtime/Nestmates/classFileParsing/TestNestmateAttributes.java	Thu Feb 08 21:12:21 2018 -0500
@@ -32,6 +32,7 @@
  *          BadNestMembersLength.jcod
  *          BadNestMembersEntry.jcod
  *          BadNestHost.jcod
+ *          BadNestHostLength.jcod
  * @run main TestNestmateAttributes
  */
 
@@ -45,6 +46,7 @@
             "BadNestMembersLength",
             "BadNestMembersEntry",
             "NestmateAttributeHolder$BadNestHost",
+            "NestmateAttributeHolder$BadNestHostLength",
         };
 
         String[] messages = new String[] {
@@ -55,6 +57,7 @@
             "Wrong NestMembers attribute length",
             "Nest member class_info_index 9 has bad constant type",
             "Nest-host class_info_index 10 has bad constant type",
+            "Wrong NestHost attribute length",
         };
 
         for (int i = 0; i < badClasses.length; i++ ) {