WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pendding hook on R

This commit is contained in:
LoveSy 2021-01-29 06:42:41 +08:00
parent 716dfae0f6
commit e5379ea27e
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/cpp/main/include/art/runtime/class_linker.h
View File

@ -45,11 +45,12 @@ namespace art {
}); });
CREATE_MEM_HOOK_STUB_ENTRIES( CREATE_MEM_HOOK_STUB_ENTRIES(
"_ZN3art11ClassLinker22FixupStaticTrampolinesEPNS_6ThreadENS_6ObjPtrINS_6mirror5ClassEEE", "_ZN3art11ClassLinker20MarkClassInitializedEPNS_6ThreadENS_6HandleINS_6mirror5ClassEEE",
void, FixupStaticTrampolinesWithThread, (void * thiz, void*, MarkClassInitialized, (void * thiz, void * self, uint32_t * clazz_ptr), {
void * thread, void * clazz_ptr), { void *result = backup(thiz, self, clazz_ptr);
backup(thiz, thread, clazz_ptr); auto ptr = reinterpret_cast<void *>(*clazz_ptr);
MaybeDelayHook(clazz_ptr); MaybeDelayHook(ptr);
return result;
}); });
CREATE_MEM_FUNC_SYMBOL_ENTRY(void, MakeInitializedClassesVisiblyInitialized, void *thiz, CREATE_MEM_FUNC_SYMBOL_ENTRY(void, MakeInitializedClassesVisiblyInitialized, void *thiz,
@ -126,10 +127,19 @@ namespace art {
RETRIEVE_MEM_FUNC_SYMBOL(SetEntryPointsToInterpreter, RETRIEVE_MEM_FUNC_SYMBOL(SetEntryPointsToInterpreter,
"_ZNK3art11ClassLinker27SetEntryPointsToInterpreterEPNS_9ArtMethodE"); "_ZNK3art11ClassLinker27SetEntryPointsToInterpreterEPNS_9ArtMethodE");
lspd::HookSyms(handle, hook_func, FixupStaticTrampolines,
FixupStaticTrampolinesWithThread);
lspd::HookSyms(handle, hook_func, ShouldUseInterpreterEntrypoint); lspd::HookSyms(handle, hook_func, ShouldUseInterpreterEntrypoint);
if (api_level >= __ANDROID_API_R__) {
// In android R, FixupStaticTrampolines won't be called unless it's marking it as
// invisiblyInitialized.
// So we miss some calls between initialized and invisiblyInitialized.
// Therefore we hook the new introduced MarkClassInitialized instead
// This only happens on non-x86 devices
lspd::HookSyms(handle, hook_func, MarkClassInitialized);
} else {
lspd::HookSyms(handle, hook_func, FixupStaticTrampolines);
}
// MakeInitializedClassesVisiblyInitialized will cause deadlock // MakeInitializedClassesVisiblyInitialized will cause deadlock
// IsQuickToInterpreterBridge is inlined // IsQuickToInterpreterBridge is inlined
// So we use GetSavedEntryPointOfPreCompiledMethod instead // So we use GetSavedEntryPointOfPreCompiledMethod instead

4
core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java
View File

@ -29,13 +29,9 @@ public class ClassUtils {
* 5.0-8.0: kInitialized = 10 int * 5.0-8.0: kInitialized = 10 int
* 8.1: kInitialized = 11 int * 8.1: kInitialized = 11 int
* 9.0+: kInitialized = 14 uint8_t * 9.0+: kInitialized = 14 uint8_t
* 11.0+: kVisiblyInitialized = 15 uint8_t
*/ */
@ApiSensitive(Level.MIDDLE) @ApiSensitive(Level.MIDDLE)
public static boolean isInitialized(Class clazz) { public static boolean isInitialized(Class clazz) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
return getClassStatus(clazz, true) == 15;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
return getClassStatus(clazz, true) == 14; return getClassStatus(clazz, true) == 14;
} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O_MR1) { } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O_MR1) {