From 920b18be87d248413f549d978d7dd68495a6ea7c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 18 Jun 2018 19:45:47 +0200 Subject: sys: mark output resources as opt Mark output resources as opt in preparation for more precise constructor calculation. --- executor/syscalls_akaros.h | 2 +- executor/syscalls_freebsd.h | 2 +- executor/syscalls_fuchsia.h | 4 +- executor/syscalls_linux.h | 130 +++++++++++++++++++++++++++++++++++++++----- executor/syscalls_netbsd.h | 2 +- executor/syscalls_test.h | 12 ++-- 6 files changed, 128 insertions(+), 24 deletions(-) (limited to 'executor') diff --git a/executor/syscalls_akaros.h b/executor/syscalls_akaros.h index 69ca4e481..6ea7ea44e 100644 --- a/executor/syscalls_akaros.h +++ b/executor/syscalls_akaros.h @@ -2,7 +2,7 @@ #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "b3ec742aa8b8f4d014d4030760d098325dfb1f62" +#define SYZ_REVISION "9c09d67e0d2fb4a004add22093616420ce831dfc" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 diff --git a/executor/syscalls_freebsd.h b/executor/syscalls_freebsd.h index e4ae4caa1..a8b960a31 100644 --- a/executor/syscalls_freebsd.h +++ b/executor/syscalls_freebsd.h @@ -2,7 +2,7 @@ #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "12b2862424799cb250e904a2da79cb45f1b79bbc" +#define SYZ_REVISION "8cb11e146d49a5c6a0d12d988e21f2e9ca2c2f94" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 diff --git a/executor/syscalls_fuchsia.h b/executor/syscalls_fuchsia.h index 4f88c60b6..71168ed25 100644 --- a/executor/syscalls_fuchsia.h +++ b/executor/syscalls_fuchsia.h @@ -2,7 +2,7 @@ #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "59c616fe9bad684c719408b4e8de7412bfe233eb" +#define SYZ_REVISION "5c60584793306c995f51b459bc98d260d6af8fd2" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 @@ -171,7 +171,7 @@ const call_t syscalls[] = { #if defined(__aarch64__) || 0 #define GOARCH "arm64" -#define SYZ_REVISION "815dd53cedad67cc59ee449f253b189bd1d01c94" +#define SYZ_REVISION "2e963a82bfbf3c29beae3fc949984472c9ef3512" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 diff --git a/executor/syscalls_linux.h b/executor/syscalls_linux.h index feb7f81ae..134821f5c 100644 --- a/executor/syscalls_linux.h +++ b/executor/syscalls_linux.h @@ -2,11 +2,11 @@ #if defined(__i386__) || 0 #define GOARCH "386" -#define SYZ_REVISION "bde06e23f09731bf5b0fdf0015b8501b8966e505" +#define SYZ_REVISION "ce1fd419049f0fae706b5bffe64e425e739b31e0" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 1966 +#define SYZ_SYSCALL_COUNT 1986 const call_t syscalls[] = { {"accept4", 364}, {"accept4$alg", 364}, @@ -1951,6 +1951,27 @@ const call_t syscalls[] = { {"wait4", 114}, {"waitid", 284}, {"write", 4}, + {"write$RDMA_USER_CM_CMD_ACCEPT", 4}, + {"write$RDMA_USER_CM_CMD_BIND", 4}, + {"write$RDMA_USER_CM_CMD_BIND_IP", 4}, + {"write$RDMA_USER_CM_CMD_CONNECT", 4}, + {"write$RDMA_USER_CM_CMD_CREATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_DESTROY_ID", 4}, + {"write$RDMA_USER_CM_CMD_DISCONNECT", 4}, + {"write$RDMA_USER_CM_CMD_GET_EVENT", 4}, + {"write$RDMA_USER_CM_CMD_INIT_QP_ATTR", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_IP_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LEAVE_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LISTEN", 4}, + {"write$RDMA_USER_CM_CMD_MIGRATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_NOTIFY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY_ROUTE", 4}, + {"write$RDMA_USER_CM_CMD_REJECT", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ADDR", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_IP", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ROUTE", 4}, {"write$binfmt_aout", 4}, {"write$binfmt_elf32", 4}, {"write$binfmt_elf64", 4}, @@ -1963,7 +1984,6 @@ const call_t syscalls[] = { {"write$evdev", 4}, {"write$eventfd", 4}, {"write$fuse", 4}, - {"write$rdma_cm", 4}, {"write$selinux_access", 4}, {"write$selinux_context", 4}, {"write$selinux_create", 4}, @@ -1980,11 +2000,11 @@ const call_t syscalls[] = { #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "785dabbb3f7361d500be84940319f1447172ce8b" +#define SYZ_REVISION "e38763f2db8f15ab6e56da5f3ff0b17982f65b95" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 2018 +#define SYZ_SYSCALL_COUNT 2038 const call_t syscalls[] = { {"accept", 43}, {"accept$alg", 43}, @@ -3981,6 +4001,27 @@ const call_t syscalls[] = { {"wait4", 61}, {"waitid", 247}, {"write", 1}, + {"write$RDMA_USER_CM_CMD_ACCEPT", 1}, + {"write$RDMA_USER_CM_CMD_BIND", 1}, + {"write$RDMA_USER_CM_CMD_BIND_IP", 1}, + {"write$RDMA_USER_CM_CMD_CONNECT", 1}, + {"write$RDMA_USER_CM_CMD_CREATE_ID", 1}, + {"write$RDMA_USER_CM_CMD_DESTROY_ID", 1}, + {"write$RDMA_USER_CM_CMD_DISCONNECT", 1}, + {"write$RDMA_USER_CM_CMD_GET_EVENT", 1}, + {"write$RDMA_USER_CM_CMD_INIT_QP_ATTR", 1}, + {"write$RDMA_USER_CM_CMD_JOIN_IP_MCAST", 1}, + {"write$RDMA_USER_CM_CMD_JOIN_MCAST", 1}, + {"write$RDMA_USER_CM_CMD_LEAVE_MCAST", 1}, + {"write$RDMA_USER_CM_CMD_LISTEN", 1}, + {"write$RDMA_USER_CM_CMD_MIGRATE_ID", 1}, + {"write$RDMA_USER_CM_CMD_NOTIFY", 1}, + {"write$RDMA_USER_CM_CMD_QUERY", 1}, + {"write$RDMA_USER_CM_CMD_QUERY_ROUTE", 1}, + {"write$RDMA_USER_CM_CMD_REJECT", 1}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ADDR", 1}, + {"write$RDMA_USER_CM_CMD_RESOLVE_IP", 1}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ROUTE", 1}, {"write$binfmt_aout", 1}, {"write$binfmt_elf32", 1}, {"write$binfmt_elf64", 1}, @@ -3993,7 +4034,6 @@ const call_t syscalls[] = { {"write$evdev", 1}, {"write$eventfd", 1}, {"write$fuse", 1}, - {"write$rdma_cm", 1}, {"write$selinux_access", 1}, {"write$selinux_context", 1}, {"write$selinux_create", 1}, @@ -4010,11 +4050,11 @@ const call_t syscalls[] = { #if defined(__arm__) || 0 #define GOARCH "arm" -#define SYZ_REVISION "ee15ae72d74ca765e2db3496672f951a1b9bfaa1" +#define SYZ_REVISION "04d8b88574ed69df06b61443822f4faf11ba462e" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 1974 +#define SYZ_SYSCALL_COUNT 1994 const call_t syscalls[] = { {"accept", 285}, {"accept$alg", 285}, @@ -5967,6 +6007,27 @@ const call_t syscalls[] = { {"wait4", 114}, {"waitid", 280}, {"write", 4}, + {"write$RDMA_USER_CM_CMD_ACCEPT", 4}, + {"write$RDMA_USER_CM_CMD_BIND", 4}, + {"write$RDMA_USER_CM_CMD_BIND_IP", 4}, + {"write$RDMA_USER_CM_CMD_CONNECT", 4}, + {"write$RDMA_USER_CM_CMD_CREATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_DESTROY_ID", 4}, + {"write$RDMA_USER_CM_CMD_DISCONNECT", 4}, + {"write$RDMA_USER_CM_CMD_GET_EVENT", 4}, + {"write$RDMA_USER_CM_CMD_INIT_QP_ATTR", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_IP_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LEAVE_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LISTEN", 4}, + {"write$RDMA_USER_CM_CMD_MIGRATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_NOTIFY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY_ROUTE", 4}, + {"write$RDMA_USER_CM_CMD_REJECT", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ADDR", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_IP", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ROUTE", 4}, {"write$binfmt_aout", 4}, {"write$binfmt_elf32", 4}, {"write$binfmt_elf64", 4}, @@ -5979,7 +6040,6 @@ const call_t syscalls[] = { {"write$evdev", 4}, {"write$eventfd", 4}, {"write$fuse", 4}, - {"write$rdma_cm", 4}, {"write$selinux_access", 4}, {"write$selinux_context", 4}, {"write$selinux_create", 4}, @@ -5996,11 +6056,11 @@ const call_t syscalls[] = { #if defined(__aarch64__) || 0 #define GOARCH "arm64" -#define SYZ_REVISION "3425b5fc030a24ba1be46429544418dd9b05de5c" +#define SYZ_REVISION "40babaee5d693fdd03746ce87a73990926352eec" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 1946 +#define SYZ_SYSCALL_COUNT 1966 const call_t syscalls[] = { {"accept", 202}, {"accept$alg", 202}, @@ -7925,6 +7985,27 @@ const call_t syscalls[] = { {"wait4", 260}, {"waitid", 95}, {"write", 64}, + {"write$RDMA_USER_CM_CMD_ACCEPT", 64}, + {"write$RDMA_USER_CM_CMD_BIND", 64}, + {"write$RDMA_USER_CM_CMD_BIND_IP", 64}, + {"write$RDMA_USER_CM_CMD_CONNECT", 64}, + {"write$RDMA_USER_CM_CMD_CREATE_ID", 64}, + {"write$RDMA_USER_CM_CMD_DESTROY_ID", 64}, + {"write$RDMA_USER_CM_CMD_DISCONNECT", 64}, + {"write$RDMA_USER_CM_CMD_GET_EVENT", 64}, + {"write$RDMA_USER_CM_CMD_INIT_QP_ATTR", 64}, + {"write$RDMA_USER_CM_CMD_JOIN_IP_MCAST", 64}, + {"write$RDMA_USER_CM_CMD_JOIN_MCAST", 64}, + {"write$RDMA_USER_CM_CMD_LEAVE_MCAST", 64}, + {"write$RDMA_USER_CM_CMD_LISTEN", 64}, + {"write$RDMA_USER_CM_CMD_MIGRATE_ID", 64}, + {"write$RDMA_USER_CM_CMD_NOTIFY", 64}, + {"write$RDMA_USER_CM_CMD_QUERY", 64}, + {"write$RDMA_USER_CM_CMD_QUERY_ROUTE", 64}, + {"write$RDMA_USER_CM_CMD_REJECT", 64}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ADDR", 64}, + {"write$RDMA_USER_CM_CMD_RESOLVE_IP", 64}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ROUTE", 64}, {"write$binfmt_aout", 64}, {"write$binfmt_elf32", 64}, {"write$binfmt_elf64", 64}, @@ -7937,7 +8018,6 @@ const call_t syscalls[] = { {"write$evdev", 64}, {"write$eventfd", 64}, {"write$fuse", 64}, - {"write$rdma_cm", 64}, {"write$selinux_access", 64}, {"write$selinux_context", 64}, {"write$selinux_create", 64}, @@ -7954,11 +8034,11 @@ const call_t syscalls[] = { #if defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || 0 #define GOARCH "ppc64le" -#define SYZ_REVISION "ff218fc605d30d57dd34d66caa68cebc72b830f8" +#define SYZ_REVISION "7901cf563a8493ad6e2f2f55d35bedbac2777c4e" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 1835 +#define SYZ_SYSCALL_COUNT 1855 const call_t syscalls[] = { {"accept", 330}, {"accept$alg", 330}, @@ -9772,6 +9852,27 @@ const call_t syscalls[] = { {"wait4", 114}, {"waitid", 272}, {"write", 4}, + {"write$RDMA_USER_CM_CMD_ACCEPT", 4}, + {"write$RDMA_USER_CM_CMD_BIND", 4}, + {"write$RDMA_USER_CM_CMD_BIND_IP", 4}, + {"write$RDMA_USER_CM_CMD_CONNECT", 4}, + {"write$RDMA_USER_CM_CMD_CREATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_DESTROY_ID", 4}, + {"write$RDMA_USER_CM_CMD_DISCONNECT", 4}, + {"write$RDMA_USER_CM_CMD_GET_EVENT", 4}, + {"write$RDMA_USER_CM_CMD_INIT_QP_ATTR", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_IP_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_JOIN_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LEAVE_MCAST", 4}, + {"write$RDMA_USER_CM_CMD_LISTEN", 4}, + {"write$RDMA_USER_CM_CMD_MIGRATE_ID", 4}, + {"write$RDMA_USER_CM_CMD_NOTIFY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY", 4}, + {"write$RDMA_USER_CM_CMD_QUERY_ROUTE", 4}, + {"write$RDMA_USER_CM_CMD_REJECT", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ADDR", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_IP", 4}, + {"write$RDMA_USER_CM_CMD_RESOLVE_ROUTE", 4}, {"write$binfmt_aout", 4}, {"write$binfmt_elf32", 4}, {"write$binfmt_elf64", 4}, @@ -9784,7 +9885,6 @@ const call_t syscalls[] = { {"write$evdev", 4}, {"write$eventfd", 4}, {"write$fuse", 4}, - {"write$rdma_cm", 4}, {"write$selinux_access", 4}, {"write$selinux_context", 4}, {"write$selinux_create", 4}, diff --git a/executor/syscalls_netbsd.h b/executor/syscalls_netbsd.h index 7fac169d8..a4cc3b867 100644 --- a/executor/syscalls_netbsd.h +++ b/executor/syscalls_netbsd.h @@ -2,7 +2,7 @@ #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "232e11e345d6f9c3ee0bdcedfacc59d22adfcb2b" +#define SYZ_REVISION "1c3f97d7ba7aa2f74ff155a040df838ef118c890" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 diff --git a/executor/syscalls_test.h b/executor/syscalls_test.h index 2643a0db3..f1359a023 100644 --- a/executor/syscalls_test.h +++ b/executor/syscalls_test.h @@ -2,11 +2,11 @@ #if 0 #define GOARCH "32" -#define SYZ_REVISION "03eb61c17cd6775babc6992bed09fd510eec1467" +#define SYZ_REVISION "d92d7712e00dad64bba08d7850d58c2c07fce4a2" #define SYZ_PAGE_SIZE 8192 #define SYZ_NUM_PAGES 2048 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 97 +#define SYZ_SYSCALL_COUNT 99 const call_t syscalls[] = { {"foo$any0", 0, (syscall_t)foo}, {"foo$anyres", 0, (syscall_t)foo}, @@ -105,17 +105,19 @@ const call_t syscalls[] = { {"syz_test$union1", 0, (syscall_t)syz_test}, {"syz_test$union2", 0, (syscall_t)syz_test}, {"syz_test$vma0", 0, (syscall_t)syz_test}, + {"unsupported$0", 0, (syscall_t)unsupported}, + {"unsupported$1", 0, (syscall_t)unsupported}, }; #endif #if 0 #define GOARCH "64" -#define SYZ_REVISION "d00f8c6b2c92c5a3d3155c34bcafacc4ee1efce3" +#define SYZ_REVISION "043151c0569399dabddfd351e1e4e097cf457238" #define SYZ_PAGE_SIZE 4096 #define SYZ_NUM_PAGES 4096 #define SYZ_DATA_OFFSET 536870912 -#define SYZ_SYSCALL_COUNT 97 +#define SYZ_SYSCALL_COUNT 99 const call_t syscalls[] = { {"foo$any0", 0, (syscall_t)foo}, {"foo$anyres", 0, (syscall_t)foo}, @@ -214,6 +216,8 @@ const call_t syscalls[] = { {"syz_test$union1", 0, (syscall_t)syz_test}, {"syz_test$union2", 0, (syscall_t)syz_test}, {"syz_test$vma0", 0, (syscall_t)syz_test}, + {"unsupported$0", 0, (syscall_t)unsupported}, + {"unsupported$1", 0, (syscall_t)unsupported}, }; #endif -- cgit mrf-deployment