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/syscalls.h | 72 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 24 deletions(-) (limited to 'executor/syscalls.h') 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