TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 19:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix first stage unload

Browse Source
This commit is contained in:
topjohnwu 2021-11-02 04:12:56 -07:00
parent e49d29a914
commit d232cba02d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ static void unload_first_stage(int, siginfo_t *info, void *) {
free(path); free(path);
struct sigaction action{}; struct sigaction action{};
action.sa_handler = SIG_DFL; action.sa_handler = SIG_DFL;
sigaction(SIGUSR1, &action, nullptr); sigaction(SIGALRM, &action, nullptr);
} }
// Make sure /proc/self/environ is sanitized // Make sure /proc/self/environ is sanitized
@ -82,19 +82,20 @@ static void second_stage_entry(void *handle, const char *tmp, char *path) {
// Register signal handler to unload 1st stage // Register signal handler to unload 1st stage
struct sigaction action{}; struct sigaction action{};
action.sa_sigaction = unload_first_stage; action.sa_sigaction = &unload_first_stage;
sigaction(SIGUSR1, &action, nullptr); action.sa_flags = SA_SIGINFO;
sigaction(SIGALRM, &action, nullptr);
// Schedule to unload 1st stage 10us later // Schedule to unload 1st stage 10us later
timer_t timer; timer_t timer;
sigevent_t event{}; sigevent_t event{};
event.sigev_notify = SIGEV_SIGNAL; event.sigev_notify = SIGEV_SIGNAL;
event.sigev_signo = SIGUSR1; event.sigev_signo = SIGALRM;
event.sigev_value.sival_ptr = path; event.sigev_value.sival_ptr = path;
timer_create(CLOCK_MONOTONIC, &event, &timer); timer_create(CLOCK_MONOTONIC, &event, &timer);
itimerspec time{}; itimerspec time{};
time.it_value.tv_nsec = 10000L; time.it_value.tv_nsec = 10000L;
timer_settime(&timer, 0, &time, nullptr); timer_settime(timer, 0, &time, nullptr);
} }
static void first_stage_entry() { static void first_stage_entry() {