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

Wait zygote socket before launching daemon (#1748)

This commit is contained in:
LoveSy 2022-03-07 22:39:21 +08:00 committed by GitHub
parent dc6a599f00
commit e40596f9f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/magisk_module/daemon
View File

@ -26,5 +26,13 @@ fi
mount tmpfs -t tmpfs /data/resource-cache
if [ ! -S "/dev/socket/zygote" ]; then
timeout 1 inotifyd - /dev/socket:near | while read -r; do
if [ -S "/dev/socket/zygote" ]; then
touch /dev/socket&
exit
fi
done
fi
# shellcheck disable=SC2086
exec /system/bin/app_process $java_options /system/bin --nice-name=lspd org.lsposed.lspd.Main "$@" >/dev/null 2>&1

1
core/src/main/cpp/main/api/zygisk_main.cpp
View File

@ -331,6 +331,7 @@ namespace lspd {
JNI_CallStaticVoidMethod(env_, process, set_argv0, JNI_NewStringUTF(env_, "system_server"));
}
Context::GetInstance()->OnNativeForkSystemServerPost(env_);
if (*allowUnload) api_->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
}
};

9
core/src/main/cpp/main/src/context.cpp
View File

@ -207,12 +207,11 @@ namespace lspd {
InstallInlineHooks();
Init(env);
FindAndCall(env, "forkSystemServerPost", "(Landroid/os/IBinder;)V", application_binder);
} else skip_ = true;
} else {
LOGI("skipped system server");
GetArt(true);
}
if (skip_) [[unlikely]] {
LOGW("skipped system server");
}
setAllowUnload(skip_);
}
void Context::OnNativeForkAndSpecializePre(JNIEnv *env,
@ -277,7 +276,7 @@ namespace lspd {
} else {
auto context = Context::ReleaseInstance();
auto service = Service::ReleaseInstance();
GetArt().reset();
GetArt(true);
LOGD("skipped %s", process_name.get());
setAllowUnload(true);
}

2
core/src/main/cpp/main/src/native_hook.cpp
View File

@ -62,7 +62,7 @@ namespace lspd {
art::thread_list::ScopedSuspendAll::Setup(handle_libart);
art::gc::ScopedGCCriticalSection::Setup(handle_libart);
art::jit::jit_code_cache::Setup(handle_libart);
GetArt().reset();
GetArt(true);
LOGD("Inline hooks installed");
}
} // namespace lspd

8
core/src/main/cpp/main/src/symbol_cache.cpp
View File

@ -33,9 +33,11 @@
namespace lspd {
std::unique_ptr<SymbolCache> symbol_cache = std::make_unique<SymbolCache>();
std::unique_ptr<const SandHook::ElfImg> &GetArt() {
std::unique_ptr<const SandHook::ElfImg> &GetArt(bool release) {
static std::unique_ptr<const SandHook::ElfImg> kArtImg = nullptr;
if (!kArtImg) {
if (release) {
kArtImg.reset();
} else if (!kArtImg) {
kArtImg = std::make_unique<SandHook::ElfImg>(kLibArtName);
}
return kArtImg;
@ -77,7 +79,7 @@ namespace lspd {
symbol_cache->do_dlopen = SandHook::ElfImg("/linker").getSymbAddress<void *>(
"__dl__Z9do_dlopenPKciPK17android_dlextinfoPKv");
if (!ok) [[unlikely]] {
GetArt().reset();
GetArt(true);
LOGE("Init symbol cache failed");
} else {
symbol_cache->initialized.test_and_set(std::memory_order_relaxed);

2
core/src/main/cpp/main/src/symbol_cache.h
View File

@ -63,7 +63,7 @@ namespace lspd {
void InitSymbolCache(SymbolCache *other);
std::unique_ptr<const SandHook::ElfImg> &GetArt();
std::unique_ptr<const SandHook::ElfImg> &GetArt(bool release=false);
}
#endif //LSPOSED_SYMBOL_CACHE_H