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

Allow fallback to /dev/pts

Browse Source
This commit is contained in:
vvb2060 2021-09-26 01:21:29 +08:00 committed by John Wu
parent 4b307cad2c
commit 3599384b38
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/jni/su/pts.cpp
View File

@ -108,6 +108,7 @@ error:
int get_pty_num(int fd) { int get_pty_num(int fd) {
int pty_num = -1; int pty_num = -1;
if (ioctl(fd, TIOCGPTN, &pty_num) != 0) { if (ioctl(fd, TIOCGPTN, &pty_num) != 0) {
LOGW("get_pty_num failed with %d: %s\n", errno, std::strerror(errno));
return -1; return -1;
} }
return pty_num; return pty_num;

15
native/jni/su/su_daemon.cpp
View File

@ -240,10 +240,19 @@ void su_daemon_handler(int client, const sock_cred *cred) {
ptmx = magiskpts + "/ptmx"; ptmx = magiskpts + "/ptmx";
} }
int ptmx_fd = xopen(ptmx.data(), O_RDWR); int ptmx_fd = xopen(ptmx.data(), O_RDWR);
int unlock = 0; grantpt(ptmx_fd);
ioctl(ptmx_fd, TIOCSPTLCK, &unlock); unlockpt(ptmx_fd);
send_fd(client, ptmx_fd);
int pty_num = get_pty_num(ptmx_fd); int pty_num = get_pty_num(ptmx_fd);
if (pty_num < 0) {
// Kernel issue? Fallback to /dev/pts
close(ptmx_fd);
pts = "/dev/pts";
ptmx_fd = xopen("/dev/ptmx", O_RDWR);
grantpt(ptmx_fd);
unlockpt(ptmx_fd);
pty_num = get_pty_num(ptmx_fd);
}
send_fd(client, ptmx_fd);
close(ptmx_fd); close(ptmx_fd);
string pts_slave = pts + "/" + to_string(pty_num); string pts_slave = pts + "/" + to_string(pty_num);