Call MakeInitializedClassVisibilyInitialized when pending hook is off

Author: yujincheng08

hooklib/src/main/cpp/includes/hide_api.h

@@ -54,6 +54,8 @@ extern "C" {
     JNIEnv *attachAndGetEvn();
 
     ArtMethod* getArtMethod(JNIEnv *env, jobject method);
+
+    void MakeInitializedClassVisibilyInitialized(void* self);
 }
 
 #endif //SANDHOOK_HIDE_API_H

hooklib/src/main/cpp/sandhook.cpp

@@ -410,7 +410,12 @@ JNIEXPORT bool nativeHookNoBackup(void* origin, void* hook) {
     return trampolineManager.installNativeHookTrampolineNoBackup(origin, hook) != nullptr;
 
 }
-
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_swift_sandhook_SandHook_MakeInitializedClassVisibilyInitialized(JNIEnv *env, jclass clazz,
+                                                                         jlong self) {
+    MakeInitializedClassVisibilyInitialized(reinterpret_cast<void*>(self));
+}
 extern "C"
 JNIEXPORT void* findSym(const char *elf, const char *sym_name) {
     SandHook::ElfImg elfImg(elf);
@@ -497,6 +502,11 @@ static JNINativeMethod jniSandHook[] = {
                 "initForPendingHook",
                 "()Z",
                 (void *) Java_com_swift_sandhook_SandHook_initForPendingHook
+        },
+        {
+            "MakeInitializedClassVisibilyInitialized",
+                "(J)V",
+                (void*) Java_com_swift_sandhook_SandHook_MakeInitializedClassVisibilyInitialized
         }
 };
 

hooklib/src/main/cpp/utils/hide_api.cpp

@@ -7,6 +7,7 @@
 #include "../includes/log.h"
 #include "../includes/utils.h"
 #include "../includes/trampoline_manager.h"
+#include "../includes/art_runtime.h"
 
 extern int SDK_INT;
 
@@ -61,6 +62,10 @@ extern "C" {
 
     void (*backup_update_methods_code)(void *, ArtMethod *, const void *) = nullptr;
 
+    void* (*make_initialized_classes_visibly_initialized_)(void*, void*, bool) = nullptr;
+
+    void* runtime_instance_ = nullptr;
+
     void initHideApi(JNIEnv* env) {
 
         env->GetJavaVM(&jvm);
@@ -176,6 +181,7 @@ extern "C" {
             }
         }
 
+        runtime_instance_ = *reinterpret_cast<void**>(getSymCompat(art_lib_path, "_ZN3art7Runtime9instance_E"));
     }
 
     bool canCompile() {
@@ -334,6 +340,19 @@ extern "C" {
         backup_update_methods_code(thiz, artMethod, quick_code);
     }
 
+    void MakeInitializedClassVisibilyInitialized(void* self){
+        if(make_initialized_classes_visibly_initialized_) {
+#ifdef __LP64__
+            constexpr size_t OFFSET_classlinker = 472;
+#else
+            constexpr size_t OFFSET_classlinker = 276;
+#endif
+            void *thiz = *reinterpret_cast<void **>(
+                    reinterpret_cast<size_t>(runtime_instance_) + OFFSET_classlinker);
+            make_initialized_classes_visibly_initialized_(thiz, self, true);
+        }
+    }
+
     bool hookClassInit(void(*callback)(void*)) {
         if (SDK_INT >= ANDROID_R) {
             void *symMarkClassInitialized = getSymCompat(art_lib_path,
@@ -352,7 +371,10 @@ extern "C" {
             backup_update_methods_code = reinterpret_cast<void (*)(void *, ArtMethod *, const void*)>(hook_native(
                     symUpdateMethodsCode, (void *) replaceUpdateMethodsCode));
 
-            if (backup_mark_class_initialized) {
+            make_initialized_classes_visibly_initialized_ = reinterpret_cast<void* (*)(void*, void*, bool)>(
+                    getSymCompat(art_lib_path, "_ZN3art11ClassLinker40MakeInitializedClassesVisiblyInitializedEPNS_6ThreadEb"));
+
+            if (backup_mark_class_initialized && backup_update_methods_code) {
                 class_init_callback = callback;
                 return true;
             } else {

hooklib/src/main/java/com/swift/sandhook/SandHook.java

@@ -97,6 +97,7 @@ public static synchronized void hook(HookWrapper.HookEntity entity) throws HookE
             return;
         } else if (entity.initClass) {
             resolveStaticMethod(target);
+            MakeInitializedClassVisibilyInitialized(getThreadId());
         }
 
         resolveStaticMethod(backup);
@@ -403,6 +404,8 @@ public static boolean tryDisableProfile(String selfPackageName) {
 
     public static native boolean initForPendingHook();
 
+    public static native void MakeInitializedClassVisibilyInitialized(long self);
+
     @FunctionalInterface
     public interface HookModeCallBack {
         int hookMode(Member originMethod);