br0kenpixel/ZygiskNext
1
0
Fork 0
mirror of https://github.com/Dr-TSNG/ZygiskNext.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix wrong entry break addr on arm32

Browse Source
This commit is contained in:
5ec1cff
2023-11-12 21:27:40 +08:00
parent 889a44cd0d
commit 36dcec0264
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
loader/src/ptracer/main.cpp
View File

@@ -18,7 +18,11 @@ int main(int argc, char **argv) {
return 0; return 0;
} else if (argc >= 3 && argv[1] == "trace"sv) { } else if (argc >= 3 && argv[1] == "trace"sv) {
auto pid = strtol(argv[2], 0, 0); auto pid = strtol(argv[2], 0, 0);
return !trace_zygote(pid); if (!trace_zygote(pid)) {
kill(pid, SIGKILL);
return 1;
}
return 0;
} else if (argc >= 3 && argv[1] == "ctl"sv) { } else if (argc >= 3 && argv[1] == "ctl"sv) {
if (argv[2] == "start"sv) { if (argv[2] == "start"sv) {
send_control_command(START); send_control_command(START);

2
loader/src/ptracer/ptracer.cpp
View File

@@ -74,7 +74,7 @@ bool inject_on_main(int pid, const char *lib_path) {
} }
if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGSEGV) { if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGSEGV) {
if (!get_regs(pid, regs)) return false; if (!get_regs(pid, regs)) return false;
if (regs.REG_IP != break_addr) { if ((regs.REG_IP & ~1) != (break_addr & ~1)) {
LOGE("stopped at unknown addr %p", (void *) regs.REG_IP); LOGE("stopped at unknown addr %p", (void *) regs.REG_IP);
return false; return false;
} }