From 1508f45368a309a3b1196a342b3d64ce7be4cc43 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 7 Dec 2019 18:45:45 +0100 Subject: sys/linux: refine few framebuffer/kbd ioctls --- executor/defs.h | 10 +++---- executor/syscalls.h | 85 ++++++++++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 35 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index bdbf01083..adf6f014a 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "dda59ab4ab2f3601d7f484f899228e2bab48760b" +#define SYZ_REVISION "1a905a0a608a1c703c5b4835919e504cd2e35675" #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 "489918ee4cccee63854b73ddcaf026f5457f9d49" +#define SYZ_REVISION "12fd85c5ed7ba166e02657faae7d73526aecc497" #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 "e44eed1463f9a652ee1e88a453fbd165fba94568" +#define SYZ_REVISION "1b31f8bb521785ad0c0758db766ad87c34b283da" #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 "7192113a6295c1ff425b8c3eb1230983f78b2241" +#define SYZ_REVISION "b4851cff27cefb8315237c6c3daa6f9992d33220" #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 "db3675b7e69c10016f4663a54044fd76b8004f80" +#define SYZ_REVISION "132c39d9ab103dc09fd86155be902eebc69f4324" #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 3a1b489ff..310718877 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -2880,6 +2880,7 @@ const call_t syscalls[] = { {"ioctl$KDSETLED", 54}, {"ioctl$KDSETMODE", 54}, {"ioctl$KDSIGACCEPT", 54}, + {"ioctl$KDSKBENT", 54}, {"ioctl$KDSKBLED", 54}, {"ioctl$KDSKBMETA", 54}, {"ioctl$KDSKBMODE", 54}, @@ -3360,12 +3361,16 @@ const call_t syscalls[] = { {"ioctl$TIOCGSID", 54}, {"ioctl$TIOCGSOFTCAR", 54}, {"ioctl$TIOCGWINSZ", 54}, - {"ioctl$TIOCLINUX2", 54}, - {"ioctl$TIOCLINUX3", 54}, - {"ioctl$TIOCLINUX4", 54}, - {"ioctl$TIOCLINUX5", 54}, - {"ioctl$TIOCLINUX6", 54}, - {"ioctl$TIOCLINUX7", 54}, + {"ioctl$TIOCL_BLANKSCREEN", 54}, + {"ioctl$TIOCL_GETKMSGREDIRECT", 54}, + {"ioctl$TIOCL_GETMOUSEREPORTING", 54}, + {"ioctl$TIOCL_GETSHIFTSTATE", 54}, + {"ioctl$TIOCL_PASTESEL", 54}, + {"ioctl$TIOCL_SCROLLCONSOLE", 54}, + {"ioctl$TIOCL_SELLOADLUT", 54}, + {"ioctl$TIOCL_SETSEL", 54}, + {"ioctl$TIOCL_SETVESABLANK", 54}, + {"ioctl$TIOCL_UNBLANKSCREEN", 54}, {"ioctl$TIOCMBIC", 54}, {"ioctl$TIOCMBIS", 54}, {"ioctl$TIOCMGET", 54}, @@ -5915,6 +5920,7 @@ const call_t syscalls[] = { {"ioctl$KDSETLED", 16}, {"ioctl$KDSETMODE", 16}, {"ioctl$KDSIGACCEPT", 16}, + {"ioctl$KDSKBENT", 16}, {"ioctl$KDSKBLED", 16}, {"ioctl$KDSKBMETA", 16}, {"ioctl$KDSKBMODE", 16}, @@ -6399,12 +6405,16 @@ const call_t syscalls[] = { {"ioctl$TIOCGSID", 16}, {"ioctl$TIOCGSOFTCAR", 16}, {"ioctl$TIOCGWINSZ", 16}, - {"ioctl$TIOCLINUX2", 16}, - {"ioctl$TIOCLINUX3", 16}, - {"ioctl$TIOCLINUX4", 16}, - {"ioctl$TIOCLINUX5", 16}, - {"ioctl$TIOCLINUX6", 16}, - {"ioctl$TIOCLINUX7", 16}, + {"ioctl$TIOCL_BLANKSCREEN", 16}, + {"ioctl$TIOCL_GETKMSGREDIRECT", 16}, + {"ioctl$TIOCL_GETMOUSEREPORTING", 16}, + {"ioctl$TIOCL_GETSHIFTSTATE", 16}, + {"ioctl$TIOCL_PASTESEL", 16}, + {"ioctl$TIOCL_SCROLLCONSOLE", 16}, + {"ioctl$TIOCL_SELLOADLUT", 16}, + {"ioctl$TIOCL_SETSEL", 16}, + {"ioctl$TIOCL_SETVESABLANK", 16}, + {"ioctl$TIOCL_UNBLANKSCREEN", 16}, {"ioctl$TIOCMBIC", 16}, {"ioctl$TIOCMBIS", 16}, {"ioctl$TIOCMGET", 16}, @@ -8942,6 +8952,7 @@ const call_t syscalls[] = { {"ioctl$KDSETLED", 54}, {"ioctl$KDSETMODE", 54}, {"ioctl$KDSIGACCEPT", 54}, + {"ioctl$KDSKBENT", 54}, {"ioctl$KDSKBLED", 54}, {"ioctl$KDSKBMETA", 54}, {"ioctl$KDSKBMODE", 54}, @@ -9399,12 +9410,16 @@ const call_t syscalls[] = { {"ioctl$TIOCGSID", 54}, {"ioctl$TIOCGSOFTCAR", 54}, {"ioctl$TIOCGWINSZ", 54}, - {"ioctl$TIOCLINUX2", 54}, - {"ioctl$TIOCLINUX3", 54}, - {"ioctl$TIOCLINUX4", 54}, - {"ioctl$TIOCLINUX5", 54}, - {"ioctl$TIOCLINUX6", 54}, - {"ioctl$TIOCLINUX7", 54}, + {"ioctl$TIOCL_BLANKSCREEN", 54}, + {"ioctl$TIOCL_GETKMSGREDIRECT", 54}, + {"ioctl$TIOCL_GETMOUSEREPORTING", 54}, + {"ioctl$TIOCL_GETSHIFTSTATE", 54}, + {"ioctl$TIOCL_PASTESEL", 54}, + {"ioctl$TIOCL_SCROLLCONSOLE", 54}, + {"ioctl$TIOCL_SELLOADLUT", 54}, + {"ioctl$TIOCL_SETSEL", 54}, + {"ioctl$TIOCL_SETVESABLANK", 54}, + {"ioctl$TIOCL_UNBLANKSCREEN", 54}, {"ioctl$TIOCMBIC", 54}, {"ioctl$TIOCMBIS", 54}, {"ioctl$TIOCMGET", 54}, @@ -11924,6 +11939,7 @@ const call_t syscalls[] = { {"ioctl$KDSETLED", 29}, {"ioctl$KDSETMODE", 29}, {"ioctl$KDSIGACCEPT", 29}, + {"ioctl$KDSKBENT", 29}, {"ioctl$KDSKBLED", 29}, {"ioctl$KDSKBMETA", 29}, {"ioctl$KDSKBMODE", 29}, @@ -12385,12 +12401,16 @@ const call_t syscalls[] = { {"ioctl$TIOCGSID", 29}, {"ioctl$TIOCGSOFTCAR", 29}, {"ioctl$TIOCGWINSZ", 29}, - {"ioctl$TIOCLINUX2", 29}, - {"ioctl$TIOCLINUX3", 29}, - {"ioctl$TIOCLINUX4", 29}, - {"ioctl$TIOCLINUX5", 29}, - {"ioctl$TIOCLINUX6", 29}, - {"ioctl$TIOCLINUX7", 29}, + {"ioctl$TIOCL_BLANKSCREEN", 29}, + {"ioctl$TIOCL_GETKMSGREDIRECT", 29}, + {"ioctl$TIOCL_GETMOUSEREPORTING", 29}, + {"ioctl$TIOCL_GETSHIFTSTATE", 29}, + {"ioctl$TIOCL_PASTESEL", 29}, + {"ioctl$TIOCL_SCROLLCONSOLE", 29}, + {"ioctl$TIOCL_SELLOADLUT", 29}, + {"ioctl$TIOCL_SETSEL", 29}, + {"ioctl$TIOCL_SETVESABLANK", 29}, + {"ioctl$TIOCL_UNBLANKSCREEN", 29}, {"ioctl$TIOCMBIC", 29}, {"ioctl$TIOCMBIS", 29}, {"ioctl$TIOCMGET", 29}, @@ -14897,6 +14917,7 @@ const call_t syscalls[] = { {"ioctl$KDSETLED", 54}, {"ioctl$KDSETMODE", 54}, {"ioctl$KDSIGACCEPT", 54}, + {"ioctl$KDSKBENT", 54}, {"ioctl$KDSKBLED", 54}, {"ioctl$KDSKBMETA", 54}, {"ioctl$KDSKBMODE", 54}, @@ -15345,12 +15366,16 @@ const call_t syscalls[] = { {"ioctl$TIOCGSID", 54}, {"ioctl$TIOCGSOFTCAR", 54}, {"ioctl$TIOCGWINSZ", 54}, - {"ioctl$TIOCLINUX2", 54}, - {"ioctl$TIOCLINUX3", 54}, - {"ioctl$TIOCLINUX4", 54}, - {"ioctl$TIOCLINUX5", 54}, - {"ioctl$TIOCLINUX6", 54}, - {"ioctl$TIOCLINUX7", 54}, + {"ioctl$TIOCL_BLANKSCREEN", 54}, + {"ioctl$TIOCL_GETKMSGREDIRECT", 54}, + {"ioctl$TIOCL_GETMOUSEREPORTING", 54}, + {"ioctl$TIOCL_GETSHIFTSTATE", 54}, + {"ioctl$TIOCL_PASTESEL", 54}, + {"ioctl$TIOCL_SCROLLCONSOLE", 54}, + {"ioctl$TIOCL_SELLOADLUT", 54}, + {"ioctl$TIOCL_SETSEL", 54}, + {"ioctl$TIOCL_SETVESABLANK", 54}, + {"ioctl$TIOCL_UNBLANKSCREEN", 54}, {"ioctl$TIOCMBIC", 54}, {"ioctl$TIOCMBIS", 54}, {"ioctl$TIOCMGET", 54}, -- cgit mrf-deployment