TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-22 02:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support hardlink based proc ns

Browse Source
This commit is contained in:
topjohnwu 2018-07-11 23:41:38 +08:00
parent ef62272df7
commit c6fc0e587e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
native/jni/magiskhide/proc_monitor.c
View File

@ -35,13 +35,10 @@ static void term_thread(int sig) {
pthread_exit(NULL); pthread_exit(NULL);
} }
static int read_namespace(const int pid, char* target, const size_t size) { static int read_ns(const int pid, struct stat *st) {
char path[32]; char path[32];
sprintf(path, "/proc/%d/ns/mnt", pid); sprintf(path, "/proc/%d/ns/mnt", pid);
if (access(path, R_OK) == -1) return stat(path, st);
return 1;
xreadlink(path, target, size);
return 0;
} }
static void lazy_unmount(const char* mountpoint) { static void lazy_unmount(const char* mountpoint) {
@ -136,7 +133,8 @@ void proc_monitor() {
while (fgets(buf, sizeof(buf), log_in)) { while (fgets(buf, sizeof(buf), log_in)) {
char *ss = strchr(buf, '['); char *ss = strchr(buf, '[');
int pid, ppid, num = 0; int pid, ppid, num = 0;
char *pos = ss, proc[256], ns[32], pns[32]; char *pos = ss, proc[256];
struct stat ns, pns;
while(1) { while(1) {
pos = strchr(pos, ','); pos = strchr(pos, ',');
@ -172,10 +170,10 @@ void proc_monitor() {
continue; continue;
ppid = parse_ppid(pid); ppid = parse_ppid(pid);
read_namespace(ppid, pns, sizeof(pns)); read_ns(ppid, &pns);
do { do {
read_namespace(pid, ns, sizeof(ns)); read_ns(pid, &ns);
if (strcmp(ns, pns) == 0) if (ns.st_dev == pns.st_dev && ns.st_ino == pns.st_ino)
usleep(50); usleep(50);
else else
break; break;
@ -189,8 +187,8 @@ void proc_monitor() {
if (colon) if (colon)
*colon = ':'; *colon = ':';
#ifdef MAGISK_DEBUG #ifdef MAGISK_DEBUG
LOGI("proc_monitor: %s (PID=[%d] ns=%s)(PPID=[%d] ns=%s)\n", LOGI("proc_monitor: %s (PID=[%d] ns=%llu)(PPID=[%d] ns=%llu)\n",
proc, pid, ns + 4, ppid, pns + 4); proc, pid, ns.st_ino, ppid, pns.st_ino);
#else #else
LOGI("proc_monitor: %s\n", proc); LOGI("proc_monitor: %s\n", proc);
#endif #endif