Change TCSAFLUSH flag to TCSANOW

termux#88
bjia56 · Dec 28, 2019 · 1f4ec1c · 1f4ec1c
1 parent 8950c03
commit 1f4ec1c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/syscall/enter.c b/src/syscall/enter.c
@@ -28,6 +28,7 @@
 #include <limits.h>      /* PATH_MAX, */
 #include <string.h>      /* strcpy */
 #include <sys/prctl.h>   /* PR_SET_DUMPABLE */
+#include <termios.h>     /* TCSETS, TCSANOW */
 
 #include "syscall/syscall.h"
 #include "syscall/sysnum.h"
@@ -576,6 +577,15 @@ int translate_syscall_enter(Tracee *tracee)
 			status = 0;
 		}
 		break;
+
+#ifdef __ANDROID__
+	case PR_ioctl:
+		/* Using literal value because Termux build system patches TCSAFLUSH */
+		if (peek_reg(tracee, CURRENT, SYSARG_2) == TCSETS + 2 /* + TCSAFLUSH */) {
+			poke_reg(tracee, SYSARG_2, TCSETS + TCSANOW);
+		}
+		break;
+#endif
 	}
 
 end:

diff --git a/src/syscall/seccomp.c b/src/syscall/seccomp.c
@@ -354,6 +354,9 @@ static FilteredSysnum proot_sysnums[] = {
 	{ PR_getsockname,	FILTER_SYSEXIT },
 	{ PR_getxattr,		0 },
 	{ PR_inotify_add_watch,	0 },
+#ifdef __ANDROID__
+	{ PR_ioctl,		0 },
+#endif
 	{ PR_lchown,		0 },
 	{ PR_lchown32,		0 },
 	{ PR_lgetxattr,		0 },