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

Prevent multiple mounts of devpts

Browse Source
This commit is contained in:
vvb2060 2021-09-20 13:15:16 +08:00 committed by John Wu
parent 713ce4719b
commit d20517483e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/core/daemon.cpp
View File

@ -349,6 +349,7 @@ static void daemon_entry() {
// Use isolated devpts if kernel support // Use isolated devpts if kernel support
if (access("/dev/pts/ptmx", F_OK) == 0) { if (access("/dev/pts/ptmx", F_OK) == 0) {
auto pts = MAGISKTMP + "/" SHELLPTS; auto pts = MAGISKTMP + "/" SHELLPTS;
if (access(pts.data(), F_OK)) {
xmkdirs(pts.data(), 0755); xmkdirs(pts.data(), 0755);
xmount("devpts", pts.data(), "devpts", xmount("devpts", pts.data(), "devpts",
MS_NOSUID | MS_NOEXEC, "newinstance"); MS_NOSUID | MS_NOEXEC, "newinstance");
@ -358,6 +359,7 @@ static void daemon_entry() {
rmdir(pts.data()); rmdir(pts.data());
} }
} }
}
sockaddr_un sun; sockaddr_un sun;
socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET); socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET);