From 1d44216fcf67bcee7a7dd19118e42d29cf9c63a7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 17 Nov 2018 14:25:28 -0800 Subject: sys/linux: modernize prctl descriptions Use one syscall per command, refine arguments, etc. --- executor/defs.h | 10 +- executor/syscalls.h | 280 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 240 insertions(+), 50 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index e98e75c35..e5c49a750 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "c721fa358300e47c465510404cbf984f34756d64" +#define SYZ_REVISION "a5436331465262bc66482761d656cfabd67917d1" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "3e31e3a63b67deadc9e884e0351741a7608a684a" +#define SYZ_REVISION "112acfabe4e7b1b36f0fbc502605c5180d3bee7f" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "8e6d0d85268780c08f36e5f635ff76437a85439b" +#define SYZ_REVISION "afc6275b4fb5b23a31eb035d17f61c6e71c4f752" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "f24b0ebfd6adca169a5d7e71242cd8fa3016e2fa" +#define SYZ_REVISION "87b3d2dfde218108edd15e08bd8912168e4461ec" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "26f797d411e958d7cf2338449a41aa9dce810505" +#define SYZ_REVISION "0944c19ee6b865deae581fd3e31e059d1989696d" #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 8c73441a2..2e5ce2149 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -2812,16 +2812,54 @@ const call_t syscalls[] = { {"pkey_mprotect", 380}, {"poll", 168}, {"ppoll", 309}, - {"prctl$getname", 172}, - {"prctl$getreaper", 172}, - {"prctl$intptr", 172}, - {"prctl$seccomp", 172}, - {"prctl$setendian", 172}, - {"prctl$setfpexc", 172}, + {"prctl$PR_CAPBSET_DROP", 172}, + {"prctl$PR_CAPBSET_READ", 172}, + {"prctl$PR_CAP_AMBIENT", 172}, + {"prctl$PR_GET_CHILD_SUBREAPER", 172}, + {"prctl$PR_GET_DUMPABLE", 172}, + {"prctl$PR_GET_ENDIAN", 172}, + {"prctl$PR_GET_FPEMU", 172}, + {"prctl$PR_GET_FPEXC", 172}, + {"prctl$PR_GET_FP_MODE", 172}, + {"prctl$PR_GET_KEEPCAPS", 172}, + {"prctl$PR_GET_NAME", 172}, + {"prctl$PR_GET_NO_NEW_PRIVS", 172}, + {"prctl$PR_GET_PDEATHSIG", 172}, + {"prctl$PR_GET_SECCOMP", 172}, + {"prctl$PR_GET_SECUREBITS", 172}, + {"prctl$PR_GET_SPECULATION_CTRL", 172}, + {"prctl$PR_GET_THP_DISABLE", 172}, + {"prctl$PR_GET_TID_ADDRESS", 172}, + {"prctl$PR_GET_TIMERSLACK", 172}, + {"prctl$PR_GET_TSC", 172}, + {"prctl$PR_GET_UNALIGN", 172}, + {"prctl$PR_MCE_KILL", 172}, + {"prctl$PR_MCE_KILL_GET", 172}, + {"prctl$PR_MPX_DISABLE_MANAGEMENT", 172}, + {"prctl$PR_MPX_ENABLE_MANAGEMENT", 172}, + {"prctl$PR_SET_CHILD_SUBREAPER", 172}, + {"prctl$PR_SET_DUMPABLE", 172}, + {"prctl$PR_SET_ENDIAN", 172}, + {"prctl$PR_SET_FPEMU", 172}, + {"prctl$PR_SET_FPEXC", 172}, + {"prctl$PR_SET_FP_MODE", 172}, + {"prctl$PR_SET_KEEPCAPS", 172}, + {"prctl$PR_SET_NAME", 172}, + {"prctl$PR_SET_NO_NEW_PRIVS", 172}, + {"prctl$PR_SET_PDEATHSIG", 172}, + {"prctl$PR_SET_PTRACER", 172}, + {"prctl$PR_SET_SECCOMP", 172}, + {"prctl$PR_SET_SECUREBITS", 172}, + {"prctl$PR_SET_SPECULATION_CTRL", 172}, + {"prctl$PR_SET_THP_DISABLE", 172}, + {"prctl$PR_SET_TIMERSLACK", 172}, + {"prctl$PR_SET_TSC", 172}, + {"prctl$PR_SET_UNALIGN", 172}, + {"prctl$PR_SVE_GET_VL", 172}, + {"prctl$PR_SVE_SET_VL", 172}, + {"prctl$PR_TASK_PERF_EVENTS_DISABLE", 172}, + {"prctl$PR_TASK_PERF_EVENTS_ENABLE", 172}, {"prctl$setmm", 172}, - {"prctl$setname", 172}, - {"prctl$setptracer", 172}, - {"prctl$void", 172}, {"pread64", 180}, {"preadv", 333}, {"prlimit64", 340}, @@ -5104,16 +5142,54 @@ const call_t syscalls[] = { {"pkey_mprotect", 329}, {"poll", 7}, {"ppoll", 271}, - {"prctl$getname", 157}, - {"prctl$getreaper", 157}, - {"prctl$intptr", 157}, - {"prctl$seccomp", 157}, - {"prctl$setendian", 157}, - {"prctl$setfpexc", 157}, + {"prctl$PR_CAPBSET_DROP", 157}, + {"prctl$PR_CAPBSET_READ", 157}, + {"prctl$PR_CAP_AMBIENT", 157}, + {"prctl$PR_GET_CHILD_SUBREAPER", 157}, + {"prctl$PR_GET_DUMPABLE", 157}, + {"prctl$PR_GET_ENDIAN", 157}, + {"prctl$PR_GET_FPEMU", 157}, + {"prctl$PR_GET_FPEXC", 157}, + {"prctl$PR_GET_FP_MODE", 157}, + {"prctl$PR_GET_KEEPCAPS", 157}, + {"prctl$PR_GET_NAME", 157}, + {"prctl$PR_GET_NO_NEW_PRIVS", 157}, + {"prctl$PR_GET_PDEATHSIG", 157}, + {"prctl$PR_GET_SECCOMP", 157}, + {"prctl$PR_GET_SECUREBITS", 157}, + {"prctl$PR_GET_SPECULATION_CTRL", 157}, + {"prctl$PR_GET_THP_DISABLE", 157}, + {"prctl$PR_GET_TID_ADDRESS", 157}, + {"prctl$PR_GET_TIMERSLACK", 157}, + {"prctl$PR_GET_TSC", 157}, + {"prctl$PR_GET_UNALIGN", 157}, + {"prctl$PR_MCE_KILL", 157}, + {"prctl$PR_MCE_KILL_GET", 157}, + {"prctl$PR_MPX_DISABLE_MANAGEMENT", 157}, + {"prctl$PR_MPX_ENABLE_MANAGEMENT", 157}, + {"prctl$PR_SET_CHILD_SUBREAPER", 157}, + {"prctl$PR_SET_DUMPABLE", 157}, + {"prctl$PR_SET_ENDIAN", 157}, + {"prctl$PR_SET_FPEMU", 157}, + {"prctl$PR_SET_FPEXC", 157}, + {"prctl$PR_SET_FP_MODE", 157}, + {"prctl$PR_SET_KEEPCAPS", 157}, + {"prctl$PR_SET_NAME", 157}, + {"prctl$PR_SET_NO_NEW_PRIVS", 157}, + {"prctl$PR_SET_PDEATHSIG", 157}, + {"prctl$PR_SET_PTRACER", 157}, + {"prctl$PR_SET_SECCOMP", 157}, + {"prctl$PR_SET_SECUREBITS", 157}, + {"prctl$PR_SET_SPECULATION_CTRL", 157}, + {"prctl$PR_SET_THP_DISABLE", 157}, + {"prctl$PR_SET_TIMERSLACK", 157}, + {"prctl$PR_SET_TSC", 157}, + {"prctl$PR_SET_UNALIGN", 157}, + {"prctl$PR_SVE_GET_VL", 157}, + {"prctl$PR_SVE_SET_VL", 157}, + {"prctl$PR_TASK_PERF_EVENTS_DISABLE", 157}, + {"prctl$PR_TASK_PERF_EVENTS_ENABLE", 157}, {"prctl$setmm", 157}, - {"prctl$setname", 157}, - {"prctl$setptracer", 157}, - {"prctl$void", 157}, {"pread64", 17}, {"preadv", 295}, {"prlimit64", 302}, @@ -7385,16 +7461,54 @@ const call_t syscalls[] = { {"pkey_mprotect", 394}, {"poll", 168}, {"ppoll", 336}, - {"prctl$getname", 172}, - {"prctl$getreaper", 172}, - {"prctl$intptr", 172}, - {"prctl$seccomp", 172}, - {"prctl$setendian", 172}, - {"prctl$setfpexc", 172}, + {"prctl$PR_CAPBSET_DROP", 172}, + {"prctl$PR_CAPBSET_READ", 172}, + {"prctl$PR_CAP_AMBIENT", 172}, + {"prctl$PR_GET_CHILD_SUBREAPER", 172}, + {"prctl$PR_GET_DUMPABLE", 172}, + {"prctl$PR_GET_ENDIAN", 172}, + {"prctl$PR_GET_FPEMU", 172}, + {"prctl$PR_GET_FPEXC", 172}, + {"prctl$PR_GET_FP_MODE", 172}, + {"prctl$PR_GET_KEEPCAPS", 172}, + {"prctl$PR_GET_NAME", 172}, + {"prctl$PR_GET_NO_NEW_PRIVS", 172}, + {"prctl$PR_GET_PDEATHSIG", 172}, + {"prctl$PR_GET_SECCOMP", 172}, + {"prctl$PR_GET_SECUREBITS", 172}, + {"prctl$PR_GET_SPECULATION_CTRL", 172}, + {"prctl$PR_GET_THP_DISABLE", 172}, + {"prctl$PR_GET_TID_ADDRESS", 172}, + {"prctl$PR_GET_TIMERSLACK", 172}, + {"prctl$PR_GET_TSC", 172}, + {"prctl$PR_GET_UNALIGN", 172}, + {"prctl$PR_MCE_KILL", 172}, + {"prctl$PR_MCE_KILL_GET", 172}, + {"prctl$PR_MPX_DISABLE_MANAGEMENT", 172}, + {"prctl$PR_MPX_ENABLE_MANAGEMENT", 172}, + {"prctl$PR_SET_CHILD_SUBREAPER", 172}, + {"prctl$PR_SET_DUMPABLE", 172}, + {"prctl$PR_SET_ENDIAN", 172}, + {"prctl$PR_SET_FPEMU", 172}, + {"prctl$PR_SET_FPEXC", 172}, + {"prctl$PR_SET_FP_MODE", 172}, + {"prctl$PR_SET_KEEPCAPS", 172}, + {"prctl$PR_SET_NAME", 172}, + {"prctl$PR_SET_NO_NEW_PRIVS", 172}, + {"prctl$PR_SET_PDEATHSIG", 172}, + {"prctl$PR_SET_PTRACER", 172}, + {"prctl$PR_SET_SECCOMP", 172}, + {"prctl$PR_SET_SECUREBITS", 172}, + {"prctl$PR_SET_SPECULATION_CTRL", 172}, + {"prctl$PR_SET_THP_DISABLE", 172}, + {"prctl$PR_SET_TIMERSLACK", 172}, + {"prctl$PR_SET_TSC", 172}, + {"prctl$PR_SET_UNALIGN", 172}, + {"prctl$PR_SVE_GET_VL", 172}, + {"prctl$PR_SVE_SET_VL", 172}, + {"prctl$PR_TASK_PERF_EVENTS_DISABLE", 172}, + {"prctl$PR_TASK_PERF_EVENTS_ENABLE", 172}, {"prctl$setmm", 172}, - {"prctl$setname", 172}, - {"prctl$setptracer", 172}, - {"prctl$void", 172}, {"pread64", 180}, {"preadv", 361}, {"prlimit64", 369}, @@ -9647,16 +9761,54 @@ const call_t syscalls[] = { {"pkey_free", 290}, {"pkey_mprotect", 288}, {"ppoll", 73}, - {"prctl$getname", 167}, - {"prctl$getreaper", 167}, - {"prctl$intptr", 167}, - {"prctl$seccomp", 167}, - {"prctl$setendian", 167}, - {"prctl$setfpexc", 167}, + {"prctl$PR_CAPBSET_DROP", 167}, + {"prctl$PR_CAPBSET_READ", 167}, + {"prctl$PR_CAP_AMBIENT", 167}, + {"prctl$PR_GET_CHILD_SUBREAPER", 167}, + {"prctl$PR_GET_DUMPABLE", 167}, + {"prctl$PR_GET_ENDIAN", 167}, + {"prctl$PR_GET_FPEMU", 167}, + {"prctl$PR_GET_FPEXC", 167}, + {"prctl$PR_GET_FP_MODE", 167}, + {"prctl$PR_GET_KEEPCAPS", 167}, + {"prctl$PR_GET_NAME", 167}, + {"prctl$PR_GET_NO_NEW_PRIVS", 167}, + {"prctl$PR_GET_PDEATHSIG", 167}, + {"prctl$PR_GET_SECCOMP", 167}, + {"prctl$PR_GET_SECUREBITS", 167}, + {"prctl$PR_GET_SPECULATION_CTRL", 167}, + {"prctl$PR_GET_THP_DISABLE", 167}, + {"prctl$PR_GET_TID_ADDRESS", 167}, + {"prctl$PR_GET_TIMERSLACK", 167}, + {"prctl$PR_GET_TSC", 167}, + {"prctl$PR_GET_UNALIGN", 167}, + {"prctl$PR_MCE_KILL", 167}, + {"prctl$PR_MCE_KILL_GET", 167}, + {"prctl$PR_MPX_DISABLE_MANAGEMENT", 167}, + {"prctl$PR_MPX_ENABLE_MANAGEMENT", 167}, + {"prctl$PR_SET_CHILD_SUBREAPER", 167}, + {"prctl$PR_SET_DUMPABLE", 167}, + {"prctl$PR_SET_ENDIAN", 167}, + {"prctl$PR_SET_FPEMU", 167}, + {"prctl$PR_SET_FPEXC", 167}, + {"prctl$PR_SET_FP_MODE", 167}, + {"prctl$PR_SET_KEEPCAPS", 167}, + {"prctl$PR_SET_NAME", 167}, + {"prctl$PR_SET_NO_NEW_PRIVS", 167}, + {"prctl$PR_SET_PDEATHSIG", 167}, + {"prctl$PR_SET_PTRACER", 167}, + {"prctl$PR_SET_SECCOMP", 167}, + {"prctl$PR_SET_SECUREBITS", 167}, + {"prctl$PR_SET_SPECULATION_CTRL", 167}, + {"prctl$PR_SET_THP_DISABLE", 167}, + {"prctl$PR_SET_TIMERSLACK", 167}, + {"prctl$PR_SET_TSC", 167}, + {"prctl$PR_SET_UNALIGN", 167}, + {"prctl$PR_SVE_GET_VL", 167}, + {"prctl$PR_SVE_SET_VL", 167}, + {"prctl$PR_TASK_PERF_EVENTS_DISABLE", 167}, + {"prctl$PR_TASK_PERF_EVENTS_ENABLE", 167}, {"prctl$setmm", 167}, - {"prctl$setname", 167}, - {"prctl$setptracer", 167}, - {"prctl$void", 167}, {"pread64", 67}, {"preadv", 69}, {"prlimit64", 261}, @@ -11797,16 +11949,54 @@ const call_t syscalls[] = { {"pkey_mprotect", 386}, {"poll", 167}, {"ppoll", 281}, - {"prctl$getname", 171}, - {"prctl$getreaper", 171}, - {"prctl$intptr", 171}, - {"prctl$seccomp", 171}, - {"prctl$setendian", 171}, - {"prctl$setfpexc", 171}, + {"prctl$PR_CAPBSET_DROP", 171}, + {"prctl$PR_CAPBSET_READ", 171}, + {"prctl$PR_CAP_AMBIENT", 171}, + {"prctl$PR_GET_CHILD_SUBREAPER", 171}, + {"prctl$PR_GET_DUMPABLE", 171}, + {"prctl$PR_GET_ENDIAN", 171}, + {"prctl$PR_GET_FPEMU", 171}, + {"prctl$PR_GET_FPEXC", 171}, + {"prctl$PR_GET_FP_MODE", 171}, + {"prctl$PR_GET_KEEPCAPS", 171}, + {"prctl$PR_GET_NAME", 171}, + {"prctl$PR_GET_NO_NEW_PRIVS", 171}, + {"prctl$PR_GET_PDEATHSIG", 171}, + {"prctl$PR_GET_SECCOMP", 171}, + {"prctl$PR_GET_SECUREBITS", 171}, + {"prctl$PR_GET_SPECULATION_CTRL", 171}, + {"prctl$PR_GET_THP_DISABLE", 171}, + {"prctl$PR_GET_TID_ADDRESS", 171}, + {"prctl$PR_GET_TIMERSLACK", 171}, + {"prctl$PR_GET_TSC", 171}, + {"prctl$PR_GET_UNALIGN", 171}, + {"prctl$PR_MCE_KILL", 171}, + {"prctl$PR_MCE_KILL_GET", 171}, + {"prctl$PR_MPX_DISABLE_MANAGEMENT", 171}, + {"prctl$PR_MPX_ENABLE_MANAGEMENT", 171}, + {"prctl$PR_SET_CHILD_SUBREAPER", 171}, + {"prctl$PR_SET_DUMPABLE", 171}, + {"prctl$PR_SET_ENDIAN", 171}, + {"prctl$PR_SET_FPEMU", 171}, + {"prctl$PR_SET_FPEXC", 171}, + {"prctl$PR_SET_FP_MODE", 171}, + {"prctl$PR_SET_KEEPCAPS", 171}, + {"prctl$PR_SET_NAME", 171}, + {"prctl$PR_SET_NO_NEW_PRIVS", 171}, + {"prctl$PR_SET_PDEATHSIG", 171}, + {"prctl$PR_SET_PTRACER", 171}, + {"prctl$PR_SET_SECCOMP", 171}, + {"prctl$PR_SET_SECUREBITS", 171}, + {"prctl$PR_SET_SPECULATION_CTRL", 171}, + {"prctl$PR_SET_THP_DISABLE", 171}, + {"prctl$PR_SET_TIMERSLACK", 171}, + {"prctl$PR_SET_TSC", 171}, + {"prctl$PR_SET_UNALIGN", 171}, + {"prctl$PR_SVE_GET_VL", 171}, + {"prctl$PR_SVE_SET_VL", 171}, + {"prctl$PR_TASK_PERF_EVENTS_DISABLE", 171}, + {"prctl$PR_TASK_PERF_EVENTS_ENABLE", 171}, {"prctl$setmm", 171}, - {"prctl$setname", 171}, - {"prctl$setptracer", 171}, - {"prctl$void", 171}, {"pread64", 179}, {"preadv", 320}, {"prlimit64", 325}, -- cgit mrf-deployment