gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-31 07:01:35 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix zygiskd not restart when zygote restarts

Browse Source
This commit is contained in:
LoveSy
2023-12-06 22:17:29 +08:00
committed by John Wu
parent d47e70cfaa
commit d49b02b274
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
native/src/core/zygisk/entry.cpp
View File

@@ -14,6 +14,7 @@
using namespace std;
void *self_handle = nullptr;
string native_bridge = "0";
extern "C" [[maybe_unused]] void zygisk_inject_entry(void *handle) {
self_handle = handle;
@@ -224,3 +225,26 @@ void zygisk_handler(int client, const sock_cred *cred) {
}
close(client);
}
void reset_zygisk(bool restore) {
if (!zygisk_enabled) return;
static atomic_uint zygote_start_count{1};
close(zygiskd_sockets[0]);
close(zygiskd_sockets[1]);
zygiskd_sockets[0] = zygiskd_sockets[1] = -1;
if (restore) {
zygote_start_count = 1;
} else if (zygote_start_count.fetch_add(1) > 3) {
LOGW("zygote crashes too many times, rolling-back\n");
restore = true;
}
if (restore) {
string native_bridge_orig = "0";
if (native_bridge.length() > strlen(ZYGISKLDR)) {
native_bridge_orig = native_bridge.substr(strlen(ZYGISKLDR));
}
set_prop(NBPROP, native_bridge_orig.data(), true);
} else {
set_prop(NBPROP, native_bridge.data(), true);
}
}