From 2f68adff0b52208bd2a86941c4c406fb9dcaa5e6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 18 Dec 2019 10:27:38 +0100 Subject: sys/linux: support new split sound ioctls Some sounds ioctls are now explicitly doubled for 32/64 bits. Support that. Fix mips SOL_SOCKET issues by rearranging includes. Improve few other fields. --- executor/defs.h | 12 ++++----- executor/syscalls.h | 72 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 30 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index eade98f3e..be6dc29c5 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "e5822d72ac94c7e7ea7890a8551a63c3348aa97c" +#define SYZ_REVISION "cd6db58056081da5ca18284ead2bd09088544a5e" #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 "1b100dfc9bbce4798a865579ab8e008c579d6edd" +#define SYZ_REVISION "0ba3a655b530c6b547fb97179e874810bf8a3d52" #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 "a4a5dd7d3b1d70403d02f40eae9e92fea6301600" +#define SYZ_REVISION "75e78533bfc7eb9268f57e693f4d7aa96528a07a" #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 "565e7000c6c6a33cba3ae1ae131a848e29c90d37" +#define SYZ_REVISION "5c85980328b4d3a3b6e75ae5590cb81b15305774" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_mips64le #define GOARCH "mips64le" -#define SYZ_REVISION "e49ce1b90c2b5112039c09124b8f73db041cb1b3" +#define SYZ_REVISION "a079b8c9e1c394d23a9af0532b71bc56b924bf80" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -120,7 +120,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "b20b704005b4ad8042014dbdf058614945e294e5" +#define SYZ_REVISION "d476ea158ce197ad401701c55c654e38fc57c1fe" #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 b0f80de6d..3cb15892a 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3252,8 +3252,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 54}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 54}, {"ioctl$SNDRV_PCM_IOCTL_START", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 54}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 54}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 54}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 54}, @@ -3267,7 +3269,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 54}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 54}, @@ -3310,7 +3313,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 54}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 54}, {"ioctl$SNDRV_TIMER_IOCTL_START", 54}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 54}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 54}, {"ioctl$SOUND_MIXER_INFO", 54}, @@ -6292,8 +6296,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 16}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 16}, {"ioctl$SNDRV_PCM_IOCTL_START", 16}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 16}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 16}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 16}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 16}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 16}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 16}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 16}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 16}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 16}, @@ -6307,7 +6313,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 16}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 16}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 16}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 16}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 16}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 16}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 16}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 16}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 16}, @@ -6350,7 +6357,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 16}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 16}, {"ioctl$SNDRV_TIMER_IOCTL_START", 16}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 16}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 16}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 16}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 16}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 16}, {"ioctl$SOUND_MIXER_INFO", 16}, @@ -9301,8 +9309,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 54}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 54}, {"ioctl$SNDRV_PCM_IOCTL_START", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 54}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 54}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 54}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 54}, @@ -9316,7 +9326,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 54}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 54}, @@ -9359,7 +9370,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 54}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 54}, {"ioctl$SNDRV_TIMER_IOCTL_START", 54}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 54}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 54}, {"ioctl$SOUND_MIXER_INFO", 54}, @@ -12288,8 +12300,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 29}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 29}, {"ioctl$SNDRV_PCM_IOCTL_START", 29}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 29}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 29}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 29}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 29}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 29}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 29}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 29}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 29}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 29}, @@ -12303,7 +12317,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 29}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 29}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 29}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 29}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 29}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 29}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 29}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 29}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 29}, @@ -12346,7 +12361,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 29}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 29}, {"ioctl$SNDRV_TIMER_IOCTL_START", 29}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 29}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 29}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 29}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 29}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 29}, {"ioctl$SOUND_MIXER_INFO", 29}, @@ -15263,8 +15279,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 5015}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 5015}, {"ioctl$SNDRV_PCM_IOCTL_START", 5015}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 5015}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 5015}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 5015}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 5015}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 5015}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 5015}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 5015}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 5015}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 5015}, @@ -15278,7 +15296,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 5015}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 5015}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 5015}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 5015}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 5015}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 5015}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 5015}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 5015}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 5015}, @@ -15321,7 +15340,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 5015}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 5015}, {"ioctl$SNDRV_TIMER_IOCTL_START", 5015}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 5015}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 5015}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 5015}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 5015}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 5015}, {"ioctl$SOUND_MIXER_INFO", 5015}, @@ -18154,8 +18174,10 @@ const call_t syscalls[] = { {"ioctl$SNDRV_PCM_IOCTL_RESUME", 54}, {"ioctl$SNDRV_PCM_IOCTL_REWIND", 54}, {"ioctl$SNDRV_PCM_IOCTL_START", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS", 54}, - {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS64", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT32", 54}, + {"ioctl$SNDRV_PCM_IOCTL_STATUS_EXT64", 54}, {"ioctl$SNDRV_PCM_IOCTL_SW_PARAMS", 54}, {"ioctl$SNDRV_PCM_IOCTL_SYNC_PTR", 54}, {"ioctl$SNDRV_PCM_IOCTL_TTSTAMP", 54}, @@ -18169,7 +18191,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_RAWMIDI_IOCTL_INFO", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PARAMS", 54}, {"ioctl$SNDRV_RAWMIDI_IOCTL_PVERSION", 54}, - {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_RAWMIDI_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CLIENT_ID", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_PORT", 54}, {"ioctl$SNDRV_SEQ_IOCTL_CREATE_QUEUE", 54}, @@ -18212,7 +18235,8 @@ const call_t syscalls[] = { {"ioctl$SNDRV_TIMER_IOCTL_PVERSION", 54}, {"ioctl$SNDRV_TIMER_IOCTL_SELECT", 54}, {"ioctl$SNDRV_TIMER_IOCTL_START", 54}, - {"ioctl$SNDRV_TIMER_IOCTL_STATUS", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS32", 54}, + {"ioctl$SNDRV_TIMER_IOCTL_STATUS64", 54}, {"ioctl$SNDRV_TIMER_IOCTL_STOP", 54}, {"ioctl$SNDRV_TIMER_IOCTL_TREAD", 54}, {"ioctl$SOUND_MIXER_INFO", 54}, -- cgit mrf-deployment