umount old hijack binary

jyotidwi · Jan 18, 2023 · e836909 · e836909
1 parent 7769ba5
commit e836909
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/native/src/zygisk/entry.cpp b/native/src/zygisk/entry.cpp
@@ -224,7 +224,20 @@ static void setup_files(int client, const sock_cred *cred) {
         return;
     }
 
+    // Hijack some binary in /system/bin to host loader
+    const char *hbin;
+    string mbin;
+    int app_fd;
     bool is_64_bit = str_ends(buf, "64");
+    if (is_64_bit) {
+        hbin = HIJACK_BIN64;
+        mbin = MAGISKTMP + "/" ZYGISKBIN "/loader64.so";
+        app_fd = app_process_64;
+    } else {
+        hbin = HIJACK_BIN32;
+        mbin = MAGISKTMP + "/" ZYGISKBIN "/loader32.so";
+        app_fd = app_process_32;
+    }
 
     if (!zygote_started) {
         // First zygote launch, record time
@@ -237,6 +250,7 @@ static void setup_files(int client, const sock_cred *cred) {
         close(zygiskd_sockets[1]);
         zygiskd_sockets[0] = -1;
         zygiskd_sockets[1] = -1;
+        xumount2(hbin, MNT_DETACH);
     }
     ++zygote_start_count;
 
@@ -260,20 +274,6 @@ static void setup_files(int client, const sock_cred *cred) {
     // Ack
     write_int(client, 0);
 
-    // Hijack some binary in /system/bin to host loader
-    const char *hbin;
-    string mbin;
-    int app_fd;
-    if (is_64_bit) {
-        hbin = HIJACK_BIN64;
-        mbin = MAGISKTMP + "/" ZYGISKBIN "/loader64.so";
-        app_fd = app_process_64;
-    } else {
-        hbin = HIJACK_BIN32;
-        mbin = MAGISKTMP + "/" ZYGISKBIN "/loader32.so";
-        app_fd = app_process_32;
-    }
-
     // Receive and bind mount loader
     int ld_fd = xopen(mbin.data(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0755);
     string ld_data = read_string(client);