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

Magisk Hide: Unmount dummy skeleton

Browse Source
This commit is contained in:
topjohnwu 2016-11-06 02:09:14 +08:00
parent da94c2e1e5
commit 0498540439
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jni/magiskhide.c
View File

@ -56,8 +56,11 @@ int hideMagisk(int pid) {
char *path = NULL; char *path = NULL;
asprintf(&path, "/proc/%d/ns/mnt", pid); asprintf(&path, "/proc/%d/ns/mnt", pid);
int fd = open(path, O_RDONLY); int fd = open(path, O_RDONLY);
if(fd == -1) return 2; if(fd == -1) return 2; // Maybe process died..
if(setns(fd, 0) == -1) return 3; if(setns(fd, 0) == -1) {
fprintf(logfile, "Unable to change namespace for pid=%d\n", pid);
return 3;
}
free(path); free(path);
path = NULL; path = NULL;
@ -65,7 +68,7 @@ int hideMagisk(int pid) {
FILE *mount_fp = fopen(path, "r"); FILE *mount_fp = fopen(path, "r");
if (mount_fp == NULL) { if (mount_fp == NULL) {
fprintf(logfile, "Error opening mount list!\n"); fprintf(logfile, "Error opening mount list!\n");
return 1; return 4;
} }
free(path); free(path);
@ -73,15 +76,17 @@ int hideMagisk(int pid) {
char **mount_list = file_to_str_arr(mount_fp, &mount_size), mountpoint[256], *sbstr; char **mount_list = file_to_str_arr(mount_fp, &mount_size), mountpoint[256], *sbstr;
fclose(mount_fp); fclose(mount_fp);
// Unmount in inverse order
for(i = mount_size - 1; i >= 0; --i) { for(i = mount_size - 1; i >= 0; --i) {
if(strstr(mount_list[i], "/dev/block/loop")) { if (strstr(mount_list[i], "/dev/block/loop")) {
if (strstr(mount_list[i], "/dev/magisk")) continue;
// Everything from loop mount
sscanf(mount_list[i], "%256s %256s", mountpoint, mountpoint); sscanf(mount_list[i], "%256s %256s", mountpoint, mountpoint);
if (!strstr(mountpoint, "/dev/magisk/dummy")) } else if (strstr(mount_list[i], "tmpfs /system/")) {
lazy_unmount(mountpoint); // Directly unmount skeletons
} else if ((sbstr = strstr(mount_list[i], "/dev/magisk/dummy"))) { sscanf(mount_list[i], "%256s %256s", mountpoint, mountpoint);
sscanf(sbstr, "/dev/magisk/dummy%256s", mountpoint); } else continue;
lazy_unmount(mountpoint); lazy_unmount(mountpoint);
}
free(mount_list[i]); free(mount_list[i]);
} }
// Free memory // Free memory
@ -192,7 +197,7 @@ int main(int argc, char **argv, char **envp) {
for (i = 0; i < list_size; ++i) { for (i = 0; i < list_size; ++i) {
if(strstr(processName, hide_list[i])) { if(strstr(processName, hide_list[i])) {
fprintf(logfile, "MagiskHide: Disabling for process = %s, PID = %d, UID = %d\n", processName, pid, uid); fprintf(logfile, "MagiskHide: Disabling for process=%s, PID=%d, UID=%d\n", processName, pid, uid);
forkpid = fork(); forkpid = fork();
if (forkpid < 0) if (forkpid < 0)
break; break;
@ -200,7 +205,7 @@ int main(int argc, char **argv, char **envp) {
hideMagisk(pid); hideMagisk(pid);
return 0; return 0;
} }
wait(&i); waitpid(forkpid, NULL, 0);
kill(forkpid, SIGTERM); kill(forkpid, SIGTERM);
break; break;
} }