commit 8c82bcccdf3f179a8e5d7fe2753e212a88e20dd6
author Elliott Hughes <enh@google.com> Fri Aug 02 23:35:59 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 02 23:35:59 2013 +0000
tree 43fb00c47bf1967b0fc8b60def46d78bf45fa36d
parent 813a3a2d1c295266299425cac35a817b06f026e3
parent ff7ff110d17428732a97c37bf31f7f49d194f638

Merge "Check JNI versions handed to JNI and JII functions."

vm/Jni.cpp

diff --git a/vm/Jni.cpp b/vm/Jni.cpp
index d91eb9c..4ada075 100644
--- a/vm/Jni.cpp
+++ b/vm/Jni.cpp
@@ -285,6 +285,11 @@
     dvmClearReferenceTable(&gDvm.jniPinRefTable);
 }
 
+bool dvmIsBadJniVersion(int version) {
+  // We don't support JNI_VERSION_1_1. These are the only other valid versions.
+  return version != JNI_VERSION_1_2 && version != JNI_VERSION_1_4 && version != JNI_VERSION_1_6;
+}
+
 /*
  * Find the JNIEnv associated with the current thread.
  *
@@ -2814,6 +2819,13 @@
         argsCopy.name = NULL;
         argsCopy.group = (jobject) dvmGetMainThreadGroup();
     } else {
+        if (dvmIsBadJniVersion(args->version)) {
+            ALOGE("Bad JNI version passed to %s: %d",
+                  (isDaemon ? "AttachCurrentThreadAsDaemon" : "AttachCurrentThread"),
+                  args->version);
+            return JNI_EVERSION;
+        }
+
         argsCopy.version = args->version;
         argsCopy.name = args->name;
         if (args->group != NULL) {
@@ -2892,7 +2904,8 @@
 static jint GetEnv(JavaVM* vm, void** env, jint version) {
     Thread* self = dvmThreadSelf();
 
-    if (version < JNI_VERSION_1_1 || version > JNI_VERSION_1_6) {
+    if (dvmIsBadJniVersion(version)) {
+        ALOGE("Bad JNI version passed to GetEnv: %d", version);
         return JNI_EVERSION;
     }
 
@@ -3408,7 +3421,8 @@
  */
 jint JNI_CreateJavaVM(JavaVM** p_vm, JNIEnv** p_env, void* vm_args) {
     const JavaVMInitArgs* args = (JavaVMInitArgs*) vm_args;
-    if (args->version < JNI_VERSION_1_2) {
+    if (dvmIsBadJniVersion(args->version)) {
+        ALOGE("Bad JNI version passed to CreateJavaVM: %d", args->version);
         return JNI_EVERSION;
     }
 

vm/JniInternal.h

diff --git a/vm/JniInternal.h b/vm/JniInternal.h
index 8bb5975..094a640 100644
--- a/vm/JniInternal.h
+++ b/vm/JniInternal.h
@@ -25,6 +25,8 @@
 bool dvmJniStartup(void);
 void dvmJniShutdown(void);
 
+bool dvmIsBadJniVersion(int version);
+
 /*
  * Our data structures for JNIEnv and JavaVM.
  *

vm/Native.cpp

diff --git a/vm/Native.cpp b/vm/Native.cpp
index 8892c2a..a024db8 100644
--- a/vm/Native.cpp
+++ b/vm/Native.cpp
@@ -438,11 +438,12 @@
             dvmChangeStatus(self, oldStatus);
             self->classLoaderOverride = prevOverride;
 
-            if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_4 &&
-                version != JNI_VERSION_1_6)
-            {
-                ALOGW("JNI_OnLoad returned bad version (%d) in %s %p",
-                    version, pathName, classLoader);
+            if (version == JNI_ERR) {
+                *detail = strdup(StringPrintf("JNI_ERR returned from JNI_OnLoad in \"%s\"",
+                                              pathName).c_str());
+            } else if (dvmIsBadJniVersion(version)) {
+                *detail = strdup(StringPrintf("Bad JNI version returned from JNI_OnLoad in \"%s\": %d",
+                                              pathName, version).c_str());
                 /*
                  * It's unwise to call dlclose() here, but we can mark it
                  * as bad and ensure that future load attempts will fail.
@@ -453,10 +454,10 @@
                  * unregister them, but that doesn't seem worthwhile.
                  */
                 result = false;
-            } else {
-                if (gDvm.verboseJni) {
-                    ALOGI("[Returned from JNI_OnLoad for \"%s\"]", pathName);
-                }
+            }
+            if (gDvm.verboseJni) {
+                ALOGI("[Returned %s from JNI_OnLoad for \"%s\"]",
+                      (result ? "successfully" : "failure"), pathName);
             }
         }