august/LSPlant
1
0
Fork 0
mirror of https://github.com/LSPosed/LSPlant.git synced 2025-05-04 20:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix jit crash caused by hooking intrinsic methods in bootclasspath on Android 15 and above

Browse Source
This commit is contained in:
Eirv 2025-03-31 16:42:54 +08:00
parent ff815781ba
commit 9733e5a3f2
No known key found for this signature in database
GPG Key ID: 7AD363A0922F8512
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lsplant/src/main/jni/art/runtime/art_method.cxx
View File

@ -28,6 +28,9 @@ class ArtMethod {
inline static auto GetMethodShorty_ =
"_ZN3art15GetMethodShortyEP7_JNIEnvP10_jmethodID"_sym.as<const char *(JNIEnv *env, jmethodID mid)>;
inline static auto SetNotIntrinsic_ =
"_ZN3art9ArtMethod15SetNotIntrinsicEv"_sym.as<void (ArtMethod::*)()>;
inline static auto ThrowInvocationTimeError_ =
"_ZN3art9ArtMethod24ThrowInvocationTimeErrorEv"_sym.as<void(ArtMethod::*)()>;
@ -103,6 +106,16 @@ public:
SetAccessFlags(access_flags);
}
void SetNonIntrinsic() {
if (SetNotIntrinsic_) [[likely]] {
SetNotIntrinsic_(this);
} else {
auto access_flags = GetAccessFlags();
access_flags &= ~kAccIntrinsic;
SetAccessFlags(access_flags);
}
}
bool IsPrivate() { return GetAccessFlags() & kAccPrivate; }
bool IsProtected() { return GetAccessFlags() & kAccProtected; }
bool IsPublic() { return GetAccessFlags() & kAccPublic; }
@ -110,6 +123,7 @@ public:
bool IsStatic() { return GetAccessFlags() & kAccStatic; }
bool IsNative() { return GetAccessFlags() & kAccNative; }
bool IsConstructor() { return GetAccessFlags() & kAccConstructor; }
bool IsIntrinsic() { return GetAccessFlags() & kAccIntrinsic; }
void CopyFrom(const ArtMethod *other) { memcpy(this, other, art_method_size); }
@ -302,6 +316,10 @@ public:
handler(PrettyMethod_, PrettyMethodStatic_, PrettyMethodMirror_);
if (sdk_int >= __ANDROID_API_V__) {
handler(SetNotIntrinsic_);
}
if (sdk_int <= __ANDROID_API_O__) [[unlikely]] {
auto abstract_method_error = JNI_FindClass(env, "java/lang/AbstractMethodError");
if (!abstract_method_error) {
@ -367,6 +385,7 @@ private:
inline static uint32_t kAccPreCompiled = 0x00200000;
inline static uint32_t kAccCompileDontBother = 0x02000000;
inline static uint32_t kAccDefaultConflict = 0x01000000;
inline static uint32_t kAccIntrinsic = 0x80000000;
};
} // namespace lsplant::art

4
lsplant/src/main/jni/lsplant.cc
View File

@ -539,6 +539,10 @@ bool DoHook(ArtMethod *target, ArtMethod *hook, ArtMethod *backup) {
} else {
LOGV("Generated trampoline %p", entrypoint);
if (GetAndroidApiLevel() >= __ANDROID_API_V__ && target->IsIntrinsic()) [[unlikely]] {
target->SetNonIntrinsic();
}
hook->SetNonCompilable();
target->BackupTo(backup);