MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust hide policies

Browse Source
This commit is contained in:
topjohnwu 2017-07-07 17:52:25 +08:00
parent ba513dcb9a
commit 0dcfaaf5ff
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jni/magiskhide/hide_daemon.c
View File

@ -90,7 +90,7 @@ int hide_daemon() {
} }
// First unmount dummy skeletons, /sbin links, cache mounts, and mirrors // First unmount dummy skeletons, /sbin links, cache mounts, and mirrors
vec_for_each_r(&mount_list, line) { vec_for_each(&mount_list, line) {
if (strstr(line, "tmpfs /system") || strstr(line, "tmpfs /vendor") || strstr(line, "tmpfs /sbin") if (strstr(line, "tmpfs /system") || strstr(line, "tmpfs /vendor") || strstr(line, "tmpfs /sbin")
|| (strstr(line, cache_block) && (strstr(line, " /system") || strstr(line, " /vendor"))) || (strstr(line, cache_block) && (strstr(line, " /system") || strstr(line, " /vendor")))
|| strstr(line, MIRRDIR)) { || strstr(line, MIRRDIR)) {
@ -106,25 +106,9 @@ int hide_daemon() {
vec_init(&mount_list); vec_init(&mount_list);
file_to_vector(buffer, &mount_list); file_to_vector(buffer, &mount_list);
// Unmount loop mounts on /system, /vendor, /magisk // Unmount any loop mounts and dummy mounts
vec_for_each_r(&mount_list, line) { vec_for_each(&mount_list, line) {
if (strstr(line, "/dev/block/loop") if (strstr(line, "/dev/block/loop") || strstr(line, DUMMDIR)) {
&& (strstr(line, " /system") || strstr(line, " /vendor") || strstr(line, " /magisk"))) {
sscanf(line, "%*s %512s", buffer);
lazy_unmount(buffer);
}
free(line);
}
vec_destroy(&mount_list);
// Re-read mount infos
snprintf(buffer, sizeof(buffer), "/proc/%d/mounts", pid);
vec_init(&mount_list);
file_to_vector(buffer, &mount_list);
// Unmount remaining mounts on dummy skeletons
vec_for_each_r(&mount_list, line) {
if (strstr(line, DUMMDIR)) {
sscanf(line, "%*s %512s", buffer); sscanf(line, "%*s %512s", buffer);
lazy_unmount(buffer); lazy_unmount(buffer);
} }