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

Don't care if child threads were unknown

Browse Source
This commit is contained in:
topjohnwu 2019-03-10 02:46:32 -04:00
parent 20f204810e
commit 5111086637
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
native/jni/magiskhide/proc_monitor.cpp
View File

@ -323,13 +323,6 @@ static bool check_pid(int pid) {
return true; return true;
} }
static void handle_unknown(int tid, int pid = -1) {
if (unknowns[pid]) {
unknowns[pid] = false;
tgkill(pid < 0 ? tid : pid, tid, SIGSTOP);
}
}
static void new_zygote(int pid) { static void new_zygote(int pid) {
if (zygote_map.count(pid)) if (zygote_map.count(pid))
return; return;
@ -395,7 +388,7 @@ void proc_monitor() {
attaches[pid] = false; attaches[pid] = false;
detaches[pid] = false; detaches[pid] = false;
unknowns[pid] = false; unknowns[pid] = false;
xptrace(PTRACE_DETACH, pid); ptrace(PTRACE_DETACH, pid, 0, 0);
} }
}); });
if (WIFSTOPPED(status)) { if (WIFSTOPPED(status)) {
@ -413,12 +406,17 @@ void proc_monitor() {
case PTRACE_EVENT_VFORK: case PTRACE_EVENT_VFORK:
PTRACE_LOG("zygote forked: [%d]\n", msg); PTRACE_LOG("zygote forked: [%d]\n", msg);
attaches[msg] = true; attaches[msg] = true;
handle_unknown(msg); if (unknowns[msg]) {
/* Stop the child again to make sure
* we are monitoring the proper events */
unknowns[msg] = false;
tgkill(msg, msg, SIGSTOP);
}
break; break;
case PTRACE_EVENT_EXIT: case PTRACE_EVENT_EXIT:
PTRACE_LOG("zygote exited with status: [%d]\n", msg); PTRACE_LOG("zygote exited with status: [%d]\n", msg);
zygote_map.erase(pid); zygote_map.erase(pid);
break; DETACH_AND_CONT;
default: default:
PTRACE_LOG("unknown event: %d\n", WEVENT(status)); PTRACE_LOG("unknown event: %d\n", WEVENT(status));
break; break;
@ -429,13 +427,12 @@ void proc_monitor() {
case PTRACE_EVENT_CLONE: case PTRACE_EVENT_CLONE:
PTRACE_LOG("create new threads: [%d]\n", msg); PTRACE_LOG("create new threads: [%d]\n", msg);
detaches[msg] = true; detaches[msg] = true;
handle_unknown(msg, pid);
if (attaches[pid] && check_pid(pid)) if (attaches[pid] && check_pid(pid))
continue; continue;
break; break;
case PTRACE_EVENT_EXEC: case PTRACE_EVENT_EXEC:
case PTRACE_EVENT_EXIT: case PTRACE_EVENT_EXIT:
PTRACE_LOG("exited or execve\n", msg); PTRACE_LOG("exited or execve\n");
DETACH_AND_CONT; DETACH_AND_CONT;
default: default:
PTRACE_LOG("unknown event: %d\n", WEVENT(status)); PTRACE_LOG("unknown event: %d\n", WEVENT(status));