Magisk Hide: Unmount everything

This commit is contained in:
topjohnwu
2016-10-06 17:53:52 +08:00
parent 14946da163
commit aa54ef10ae
5 changed files with 109 additions and 59 deletions

View File

@@ -17,9 +17,13 @@ typedef unsigned short int sa_family_t;
#include <sys/resource.h>
#include <unistd.h>
#include <sys/mount.h>
#include <sys/inotify.h>
#define HIDE_LIST "/magisk/.core/hidelist"
#define HIDE_LIST "/magisk/.core/magiskhide/hidelist"
#define MOUNT_LIST "/dev/mountlist"
int hide_size = 0, mount_size = 0;
char **hide_list, **mount_list;
time_t last_update = 0;
//WARNING: Calling this will change our current namespace
//We don't care because we don't want to run from here anyway
@@ -33,74 +37,97 @@ int hideMagisk(int pid) {
int res = syscall(SYS_setns, fd, 0);
if(res == -1) return 3;
res = mount("/magisk/.core/mirror/system", "/system", "bind", MS_BIND, "");
if(res == -1) return 4;
int i;
for(i = mount_size - 1; i >= 0; --i) {
res = umount2(mount_list[i], MNT_DETACH);
if (res != -1) printf("Unmounted: %s\n", mount_list[i]);
else printf("Failed: %s\n", mount_list[i]);
}
res = umount2("/magisk", MNT_DETACH);
if(res == -1) return 4;
if (res != -1) printf("Unmounted: %s\n", "/magisk");
else printf("Failed: %s\n", "/magisk");
return 0;
}
int loadList(int fd, char ***list, int *line, time_t *last_update) {
int allocated = 16, i;
char *buffer, *tok;
struct stat file_stat;
fstat(fd, &file_stat);
if (file_stat.st_mtime == *last_update) {
return 0;
}
char** file_to_str_arr(const int fd, int *size) {
int allocated = 16;
char *buffer, *tok, **array;
off_t filesize = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
buffer = malloc(sizeof(char) * filesize);
lseek(fd, 0, SEEK_SET);
read(fd, buffer, filesize);
fstat(fd, &file_stat);
*last_update = file_stat.st_mtime;
// Free memory
for (; *line >= 0; --(*line))
free((*list)[*line]);
*line = 0;
*list = (char **) malloc(sizeof(char*) * allocated);
array = (char **) malloc(sizeof(char*) * allocated);
*size = 0;
tok = strtok(buffer, "\r\n");
while (tok != NULL) {
if (*line >= allocated) {
if (*size >= allocated) {
// Double our allocation and re-allocate
allocated = allocated * 2;
*list = (char **) realloc((*list), sizeof(char*) * allocated);
array = (char **) realloc(array, sizeof(char*) * allocated);
}
if (strlen(tok)) {
(*list)[*line] = malloc(strlen(tok));
strcpy((*list)[*line], tok);
++(*line);
array[*size] = malloc(strlen(tok));
strcpy(array[*size], tok);
++(*size);
}
tok = strtok(NULL, "\r\n");
}
free(buffer);
return array;
}
int load_hide_list(const int fd) {
int i;
struct stat file_stat;
fstat(fd, &file_stat);
if (file_stat.st_mtime == last_update) {
return 0;
}
// Free memory
for(i = 0; i < hide_size; ++i)
free(hide_list[i]);
free(hide_list);
hide_list = file_to_str_arr(fd, &hide_size);
fstat(fd, &file_stat);
last_update = file_stat.st_mtime;
printf("Get package name from config:\n");
for(i = 0; i < *line; i++)
printf("%s\n", (*list)[i]);
for(i = 0; i < hide_size; i++)
printf("%s\n", hide_list[i]);
printf("\n");
free(buffer);
}
int main(int argc, char **argv, char **envp) {
int line = -1, i;
char **list;
time_t last_update = 0;
int i;
int fd = open(HIDE_LIST, O_RDONLY);
if (fd == -1){
printf("Error opening file\n");
int hide_fd = open(HIDE_LIST, O_RDONLY);
if (hide_fd == -1){
printf("Error opening hide list\n");
exit(1);
}
int mount_fd = open(MOUNT_LIST, O_RDONLY);
if (mount_fd == -1){
printf("Error opening mount list\n");
exit(1);
}
mount_list = file_to_str_arr(mount_fd, &mount_size);
close(mount_fd);
char buffer[512];
FILE *p = popen("while true;do logcat -b events -v raw -s am_proc_start;sleep 1;done", "r");
while(!feof(p)) {
loadList(fd, &list, &line, &last_update);
load_hide_list(hide_fd);
//Format of am_proc_start is (as of Android 5.1 and 6.0)
//UserID, pid, unix uid, processName, hostingType, hostingName
@@ -126,19 +153,26 @@ int main(int argc, char **argv, char **envp) {
if(ret != 6) {
continue;
}
for (i = 0; i < line; ++i) {
if(strstr(processName, list[i]) != NULL) {
for (i = 0; i < hide_size; ++i) {
if(strstr(processName, hide_list[i]) != NULL) {
printf("Disabling for process = %s, PID = %d, UID = %d\n", processName, pid, uid);
hideMagisk(pid);
break;
}
}
}
close(fd);
pclose(p);
for (; line >= 0; line--)
free(list[line]);
free(list);
close(hide_fd);
// Free memory
for(i = 0; i < hide_size; ++i)
free(hide_list[i]);
free(hide_list);
for(i = 0; i < mount_size; ++i)
free(mount_list[i]);
free(mount_list);
return 0;
}