TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-25 23:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move first stage unload before fork

Browse Source
This commit is contained in:
topjohnwu 2021-11-02 21:53:33 -07:00
parent e20b07fa24
commit 63f670fc36
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
native/jni/zygisk/entry.cpp
View File

@ -34,13 +34,13 @@ void self_unload() {
new_daemon_thread(reinterpret_cast<thread_entry>(&dlclose), self_handle); new_daemon_thread(reinterpret_cast<thread_entry>(&dlclose), self_handle);
} }
static void unload_first_stage(int, siginfo_t *info, void *) { static char *first_stage_path = nullptr;
auto path = static_cast<char *>(info->si_value.sival_ptr); void unload_first_stage() {
unmap_all(path); if (first_stage_path) {
free(path); unmap_all(first_stage_path);
struct sigaction action{}; free(first_stage_path);
action.sa_handler = SIG_DFL; first_stage_path = nullptr;
sigaction(SIGALRM, &action, nullptr); }
} }
// Make sure /proc/self/environ is sanitized // Make sure /proc/self/environ is sanitized
@ -80,22 +80,8 @@ static void second_stage_entry(void *handle, const char *tmp, char *path) {
ZLOGD("inject 2nd stage\n"); ZLOGD("inject 2nd stage\n");
hook_functions(); hook_functions();
// Register signal handler to unload 1st stage // First stage will be unloaded before the first fork
struct sigaction action{}; first_stage_path = path;
action.sa_sigaction = &unload_first_stage;
action.sa_flags = SA_SIGINFO;
sigaction(SIGALRM, &action, nullptr);
// Schedule to unload 1st stage 10us later
timer_t timer;
sigevent_t event{};
event.sigev_notify = SIGEV_SIGNAL;
event.sigev_signo = SIGALRM;
event.sigev_value.sival_ptr = path;
timer_create(CLOCK_MONOTONIC, &event, &timer);
itimerspec time{};
time.it_value.tv_nsec = 10000L;
timer_settime(timer, 0, &time, nullptr);
} }
static void first_stage_entry() { static void first_stage_entry() {
@ -118,8 +104,10 @@ static void first_stage_entry() {
unsetenv("MAGISKTMP"); unsetenv("MAGISKTMP");
sanitize_environ(); sanitize_environ();
char *num = strrchr(path, '.') - 1;
// Update path to 2nd stage lib // Update path to 2nd stage lib
*(strrchr(path, '.') - 1) = '2'; *num = '2';
// Load second stage // Load second stage
setenv(INJECT_ENV_2, "1", 1); setenv(INJECT_ENV_2, "1", 1);
@ -127,7 +115,7 @@ static void first_stage_entry() {
remap_all(path); remap_all(path);
// Revert path to 1st stage lib // Revert path to 1st stage lib
*(strrchr(path, '.') - 1) = '1'; *num = '1';
// Run second stage entry // Run second stage entry
char *env = getenv(SECOND_STAGE_PTR); char *env = getenv(SECOND_STAGE_PTR);

2
native/jni/zygisk/hook.cpp
View File

@ -140,7 +140,9 @@ DCL_HOOK_FUNC(int, jniRegisterNativeMethods,
} }
// Skip actual fork and return cached result if applicable // Skip actual fork and return cached result if applicable
// Also unload first stage zygisk if necessary
DCL_HOOK_FUNC(int, fork) { DCL_HOOK_FUNC(int, fork) {
unload_first_stage();
return (g_ctx && g_ctx->pid >= 0) ? g_ctx->pid : old_fork(); return (g_ctx && g_ctx->pid >= 0) ? g_ctx->pid : old_fork();
} }

1
native/jni/zygisk/zygisk.hpp
View File

@ -41,6 +41,7 @@ struct AppInfo {
bool on_denylist; bool on_denylist;
}; };
void unload_first_stage();
void self_unload(); void self_unload();
void hook_functions(); void hook_functions();
bool unhook_functions(); bool unhook_functions();