stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8323243: JNI invocation of an abstract instance method corrupts the stack

Browse Source 
Reviewed-by: coleenp, shade
This commit is contained in:
David Holmes 2024-01-14 22:01:44 +00:00
parent d83ea92085
commit 71d9a83dec
4 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/share/prims/jni.cpp
View File

@ -930,6 +930,11 @@ static void jni_invoke_nonstatic(JNIEnv *env, JavaValue* result, jobject receive
}
}
if (selected_method->is_abstract()) {
ResourceMark rm(THREAD);
THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), selected_method->name()->as_C_string());
}
methodHandle method(THREAD, selected_method);
// Create object to hold arguments for the JavaCall, and associate it with

43
test/hotspot/jtreg/runtime/jni/abstractMethod/AbstractMethodClass.jasm Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2024, 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.
*
*/
/*
* This is a non-abstract class with an abstract method.
*
*/
super public class AbstractMethodClass
extends java/lang/Object
version 51:0 // Java 7 version
{
public Method "<init>":"()V"
stack 1 locals 1
{
aload_0;
invokespecial Method java/lang/Object."<init>":"()V";
return;
}
public abstract Method "abstractM":"()V";
}

68
test/hotspot/jtreg/runtime/jni/abstractMethod/TestJNIAbstractMethod.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright (c) 2024, 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 8323243
* @summary Test that invocation of an abstract method from JNI works correctly
* @compile AbstractMethodClass.jasm
* @run main/othervm/native TestJNIAbstractMethod
*/
/**
* We are testing invocation of an abstract method from JNI - which should
* simply result in throwning AbstractMethodError. To invoke an abstract method
* we must have an instance method (as abstract static methods are illegal),
* but instantiating an abstract class is also illegal at the Java language
* level, so we have to use a custom jasm class that contains an abstract method
* declaration, but which is not itself declared as an abstract class.
*/
public class TestJNIAbstractMethod {
// Invokes an abstract method from JNI and throws AbstractMethodError.
private static native void invokeAbstractM(Class<?> AMclass,
AbstractMethodClass receiver);
static {
System.loadLibrary("JNIAbstractMethod");
}
public static void main(String[] args) {
AbstractMethodClass obj = new AbstractMethodClass();
try {
System.out.println("Attempting direct invocation via Java");
obj.abstractM();
throw new RuntimeException("Did not get AbstractMethodError from Java!");
} catch (AbstractMethodError expected) {
System.out.println("ok - got expected exception: " + expected);
}
try {
System.out.println("Attempting direct invocation via JNI");
invokeAbstractM(obj.getClass(), obj);
throw new RuntimeException("Did not get AbstractMethodError from JNI!");
} catch (AbstractMethodError expected) {
System.out.println("ok - got expected exception: " + expected);
}
}
}

43
test/hotspot/jtreg/runtime/jni/abstractMethod/libJNIAbstractMethod.c Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2024, 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.
*
*/
#include <jni.h>
#include <stdio.h>
#include <stdlib.h>
JNIEXPORT void JNICALL Java_TestJNIAbstractMethod_invokeAbstractM(JNIEnv* env,
jclass this_cls,
jclass target_cls,
jobject receiver) {
jmethodID mid = (*env)->GetMethodID(env, target_cls, "abstractM", "()V");
if (mid == NULL) {
fprintf(stderr, "Error looking up method abstractM\n");
(*env)->ExceptionDescribe(env);
exit(1);
}
printf("Invoking abstract method ...\n");
(*env)->CallVoidMethod(env, receiver, mid); // Should raise exception
}