TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-03-21 05:00:51 +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

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

@ -349,13 +349,15 @@ 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;
xmkdirs(pts.data(), 0755); if (access(pts.data(), F_OK)) {
xmount("devpts", pts.data(), "devpts", xmkdirs(pts.data(), 0755);
MS_NOSUID | MS_NOEXEC, "newinstance"); xmount("devpts", pts.data(), "devpts",
auto ptmx = pts + "/ptmx"; MS_NOSUID | MS_NOEXEC, "newinstance");
if (access(ptmx.data(), F_OK)) { auto ptmx = pts + "/ptmx";
xumount(pts.data()); if (access(ptmx.data(), F_OK)) {
rmdir(pts.data()); xumount(pts.data());
rmdir(pts.data());
}
} }
} }