br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

improve: not umount modules /system mounts

Browse Source 
This commit creates a new behavior in ReZygisk umounting system where it now ignores "/system/..." mounts, as umounting them generally leads to unbootable system.
This commit is contained in:
ThePedroo
2025-04-16 02:04:40 -03:00
parent c37a5b1c8e
commit db24c1c439
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
zygiskd/src/utils.c
View File

@@ -358,7 +358,7 @@ bool exec_command(char *restrict buf, size_t len, const char *restrict file, cha
dup2(link[1], STDOUT_FILENO); dup2(link[1], STDOUT_FILENO);
close(link[0]); close(link[0]);
close(link[1]); close(link[1]);
execv(file, argv); execv(file, argv);
LOGE("execv failed: %s\n", strerror(errno)); LOGE("execv failed: %s\n", strerror(errno));
@@ -626,7 +626,7 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) {
char source_name[LONGEST_ROOT_IMPL_NAME]; char source_name[LONGEST_ROOT_IMPL_NAME];
if (impl.impl == KernelSU) strcpy(source_name, "KSU"); if (impl.impl == KernelSU) strcpy(source_name, "KSU");
else strcpy(source_name, "APatch"); else strcpy(source_name, "APatch");
const char **targets_to_unmount = NULL; const char **targets_to_unmount = NULL;
size_t num_targets = 0; size_t num_targets = 0;
@@ -639,6 +639,8 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) {
if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0)
should_unmount = true; should_unmount = true;
} else { } else {
if (strncmp(mount.target, "/system/", strlen("/system/")) == 0) continue;
if (strcmp(mount.source, source_name) == 0) should_unmount = true; if (strcmp(mount.source, source_name) == 0) should_unmount = true;
if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true; if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true;
if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true; if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true;
@@ -675,7 +677,7 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) {
} }
case Magisk: { case Magisk: {
LOGI("[Magisk] Unmounting root %s modules\n", modules_only ? "only" : "with"); LOGI("[Magisk] Unmounting root %s modules\n", modules_only ? "only" : "with");
const char **targets_to_unmount = NULL; const char **targets_to_unmount = NULL;
size_t num_targets = 0; size_t num_targets = 0;
@@ -683,27 +685,18 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) {
struct mountinfo mount = mounts.mounts[i]; struct mountinfo mount = mounts.mounts[i];
bool should_unmount = false; bool should_unmount = false;
if ( if (modules_only) {
( if (strcmp(mount.source, "magisk") == 0) should_unmount = true;
modules_only && if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) should_unmount = true;
( if (strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0) should_unmount = true;
strcmp(mount.source, "magisk") == 0 || } else {
strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 || if (strncmp(mount.target, "/system/", strlen("/system/")) == 0) continue;
strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0
) if (strcmp(mount.source, "magisk") == 0) should_unmount = true;
) || if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) should_unmount = true;
( if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true;
!modules_only && if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true;
( if (strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0) should_unmount = true;
strcmp(mount.source, "magisk") == 0 ||
strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 ||
strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0 ||
strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0 ||
strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0
)
)
) {
should_unmount = true;
} }
if (!should_unmount) continue; if (!should_unmount) continue;