TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-04 19:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent infinite loop if process is killed

Browse Source 
Close #761
This commit is contained in:
topjohnwu 2018-11-13 02:11:02 -05:00
parent 3a2a2a4ffa
commit ef40c1212e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/jni/magiskhide/proc_monitor.cpp
View File

@ -53,6 +53,8 @@ static int parse_ppid(int pid) {
int fd, ppid; int fd, ppid;
sprintf(path, "/proc/%d/stat", pid); sprintf(path, "/proc/%d/stat", pid);
fd = xopen(path, O_RDONLY); fd = xopen(path, O_RDONLY);
if (fd < 0)
return -1;
xread(fd, stat, sizeof(stat)); xread(fd, stat, sizeof(stat));
close(fd); close(fd);
/* PID COMM STATE PPID ..... */ /* PID COMM STATE PPID ..... */
@ -164,13 +166,13 @@ void proc_monitor() {
} }
} }
pthread_mutex_unlock(&list_lock); pthread_mutex_unlock(&list_lock);
if (!hide)
if (!hide || (ppid = parse_ppid(pid)) < 0 || read_ns(ppid, &pns) == -1)
continue; continue;
ppid = parse_ppid(pid);
read_ns(ppid, &pns);
do { do {
read_ns(pid, &ns); if (read_ns(pid, &ns) == -1)
break;
if (ns.st_dev == pns.st_dev && ns.st_ino == pns.st_ino) if (ns.st_dev == pns.st_dev && ns.st_ino == pns.st_ino)
usleep(50); usleep(50);
else else