From cbfd9102502f23fb418bddc14fbcf58d737940a1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 3 Dec 2019 14:32:26 +0100 Subject: sys/linux: more tuning of tty devices Enable /dev/tty{1-6}. These seem to be special. Few first connected to framebuffers. But the rest seem to be different from e.g. tty20 anyway. Also /dev/tty is different from the rest. /dev/ttyS3 and /dev/ttyprintk are different. Properly pair BSD pty terminals. --- executor/defs.h | 10 +++++----- executor/syscalls.h | 25 ++++++++++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index ef1d60742..a7ca1b7c0 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "438b358d9fdd9080d64e295ce938fed191c8ce41" +#define SYZ_REVISION "dda59ab4ab2f3601d7f484f899228e2bab48760b" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "a2243d598c0ec4e520c6963f1afc7d75b2dec7f1" +#define SYZ_REVISION "489918ee4cccee63854b73ddcaf026f5457f9d49" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "83e7db5fc9dd10ce2a4c54839576cdf363884c63" +#define SYZ_REVISION "e44eed1463f9a652ee1e88a453fbd165fba94568" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "d804230772f82df9439d9bf99cae27bc3c09670b" +#define SYZ_REVISION "7192113a6295c1ff425b8c3eb1230983f78b2241" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "c5aca5a37b89bc445a15bf9c8479238886c71c2a" +#define SYZ_REVISION "db3675b7e69c10016f4663a54044fd76b8004f80" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index 444cc8531..05580e4e1 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3989,6 +3989,8 @@ const call_t syscalls[] = { {"openat$trusty_km", 295}, {"openat$trusty_km_secure", 295}, {"openat$trusty_storage", 295}, + {"openat$tty", 295}, + {"openat$ttyS3", 295}, {"openat$ttynull", 295}, {"openat$ttyprintk", 295}, {"openat$tun", 295}, @@ -4809,7 +4811,8 @@ const call_t syscalls[] = { {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tty", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbfs", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbmon", 0, (syscall_t)syz_open_dev}, @@ -7025,6 +7028,8 @@ const call_t syscalls[] = { {"openat$trusty_km", 257}, {"openat$trusty_km_secure", 257}, {"openat$trusty_storage", 257}, + {"openat$tty", 257}, + {"openat$ttyS3", 257}, {"openat$ttynull", 257}, {"openat$ttyprintk", 257}, {"openat$tun", 257}, @@ -7846,7 +7851,8 @@ const call_t syscalls[] = { {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tty", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbfs", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbmon", 0, (syscall_t)syz_open_dev}, @@ -10016,6 +10022,8 @@ const call_t syscalls[] = { {"openat$trusty_km", 322}, {"openat$trusty_km_secure", 322}, {"openat$trusty_storage", 322}, + {"openat$tty", 322}, + {"openat$ttyS3", 322}, {"openat$ttynull", 322}, {"openat$ttyprintk", 322}, {"openat$tun", 322}, @@ -10835,7 +10843,8 @@ const call_t syscalls[] = { {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tty", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbfs", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbmon", 0, (syscall_t)syz_open_dev}, @@ -12991,6 +13000,8 @@ const call_t syscalls[] = { {"openat$trusty_km", 56}, {"openat$trusty_km_secure", 56}, {"openat$trusty_storage", 56}, + {"openat$tty", 56}, + {"openat$ttyS3", 56}, {"openat$ttynull", 56}, {"openat$ttyprintk", 56}, {"openat$tun", 56}, @@ -13798,7 +13809,8 @@ const call_t syscalls[] = { {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tty", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbfs", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbmon", 0, (syscall_t)syz_open_dev}, @@ -15961,6 +15973,8 @@ const call_t syscalls[] = { {"openat$trusty_km", 286}, {"openat$trusty_km_secure", 286}, {"openat$trusty_storage", 286}, + {"openat$tty", 286}, + {"openat$ttyS3", 286}, {"openat$ttynull", 286}, {"openat$ttyprintk", 286}, {"openat$tun", 286}, @@ -16779,7 +16793,8 @@ const call_t syscalls[] = { {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tty", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbfs", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$usbmon", 0, (syscall_t)syz_open_dev}, -- cgit mrf-deployment