From a6e3054436b5cc7f8c4acbce9841ecb17f699fb1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Nov 2019 18:44:30 +0100 Subject: executor: rename some macros Rename some macros in preparation for subsequent changes which will align names across the code base. --- pkg/csource/generated.go | 162 +++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'pkg/csource/generated.go') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 3ad192f28..7d40c5615 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -33,9 +33,9 @@ NORETURN void doexit(int status) } #endif -#if SYZ_EXECUTOR || SYZ_PROCS || SYZ_REPEAT && SYZ_ENABLE_CGROUPS || \ - SYZ_ENABLE_NETDEV || __NR_syz_mount_image || __NR_syz_read_part_table || \ - __NR_syz_usb_connect || (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_MULTI_PROC || SYZ_REPEAT && SYZ_CGROUPS || \ + SYZ_NET_DEVICES || __NR_syz_mount_image || __NR_syz_read_part_table || \ + __NR_syz_usb_connect || (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && SYZ_NET_INJECTION unsigned long long procid; #endif @@ -131,7 +131,7 @@ static void sleep_ms(uint64 ms) #endif #if SYZ_EXECUTOR || SYZ_THREADED || SYZ_REPEAT && SYZ_EXECUTOR_USES_FORK_SERVER || \ - SYZ_ENABLE_LEAK + SYZ_LEAK #include static uint64 current_time_ms(void) @@ -143,14 +143,14 @@ static uint64 current_time_ms(void) } #endif -#if SYZ_EXECUTOR || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP || SYZ_USE_TMP_DIR +#if SYZ_EXECUTOR || SYZ_SANDBOX_ANDROID || SYZ_USE_TMP_DIR #include #include #include static void use_temporary_dir(void) { -#if SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_SANDBOX_ANDROID char tmpdir_template[] = "/data/data/syzkaller/syzkaller.XXXXXX"; #elif GOOS_fuchsia char tmpdir_template[] = "/tmp/syzkaller.XXXXXX"; @@ -432,7 +432,7 @@ static uintptr_t syz_open_pts(void) #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION #include #include @@ -570,7 +570,7 @@ static void initialize_tun(int tun_id) #endif -#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_NET_INJECTION #include #include @@ -587,7 +587,7 @@ static long syz_emit_ethernet(volatile long a0, volatile long a1) } #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE && (__NR_syz_extract_tcp_res || SYZ_REPEAT) +#if SYZ_EXECUTOR || SYZ_NET_INJECTION && (__NR_syz_extract_tcp_res || SYZ_REPEAT) #include static int read_tun(char* data, int size) @@ -605,7 +605,7 @@ static int read_tun(char* data, int size) } #endif -#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_NET_INJECTION struct tcp_resources { uint32 seq; @@ -708,7 +708,7 @@ static void loop(); static int do_sandbox_none(void) { sandbox_common(); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(procid); #endif loop(); @@ -743,7 +743,7 @@ static int do_sandbox_setuid(void) return wait_for_loop(pid); sandbox_common(); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(procid); #endif @@ -1106,9 +1106,9 @@ static int event_timedwait(event_t* ev, uint64 timeout) } #endif -#if SYZ_EXECUTOR || SYZ_REPEAT || SYZ_TUN_ENABLE || SYZ_FAULT_INJECTION || SYZ_SANDBOX_NONE || \ - SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP || \ - SYZ_FAULT_INJECTION || SYZ_ENABLE_LEAK || SYZ_ENABLE_BINFMT_MISC +#if SYZ_EXECUTOR || SYZ_REPEAT || SYZ_NET_INJECTION || SYZ_FAULT || SYZ_SANDBOX_NONE || \ + SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID || \ + SYZ_FAULT || SYZ_LEAK || SYZ_BINFMT_MISC #include #include #include @@ -1142,7 +1142,7 @@ static bool write_file(const char* file, const char* what, ...) } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV || SYZ_TUN_ENABLE || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_NET_DEVICES || SYZ_NET_INJECTION || SYZ_DEVLINK_PCI #include #include #include @@ -1189,7 +1189,7 @@ static void netlink_attr(struct nlmsg* nlmsg, int typ, nlmsg->pos += NLMSG_ALIGN(attr->nla_len); } -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES static void netlink_nest(struct nlmsg* nlmsg, int typ) { struct nlattr* attr = (struct nlattr*)nlmsg->pos; @@ -1241,7 +1241,7 @@ static int netlink_send(struct nlmsg* nlmsg, int sock) return netlink_send_ext(nlmsg, sock, 0, NULL); } -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_NET_DEVICES || SYZ_DEVLINK_PCI static int netlink_next_msg(struct nlmsg* nlmsg, unsigned int offset, unsigned int total_len) { @@ -1253,7 +1253,7 @@ static int netlink_next_msg(struct nlmsg* nlmsg, unsigned int offset, } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES static void netlink_add_device_impl(struct nlmsg* nlmsg, const char* type, const char* name) { @@ -1310,7 +1310,7 @@ static void netlink_add_hsr(struct nlmsg* nlmsg, int sock, const char* name, } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV || SYZ_TUN_ENABLE || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_NET_DEVICES || SYZ_NET_INJECTION || SYZ_DEVLINK_PCI static void netlink_device_change(struct nlmsg* nlmsg, int sock, const char* name, bool up, const char* master, const void* mac, int macsize, const char* new_name) @@ -1335,7 +1335,7 @@ static void netlink_device_change(struct nlmsg* nlmsg, int sock, const char* nam } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_DEVICES || SYZ_NET_INJECTION static int netlink_add_addr(struct nlmsg* nlmsg, int sock, const char* dev, const void* addr, int addrsize) { @@ -1372,7 +1372,7 @@ static void netlink_add_addr6(struct nlmsg* nlmsg, int sock, } #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION static void netlink_add_neigh(struct nlmsg* nlmsg, int sock, const char* name, const void* addr, int addrsize, const void* mac, int macsize) { @@ -1392,7 +1392,7 @@ static void netlink_add_neigh(struct nlmsg* nlmsg, int sock, const char* name, #endif #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION #include #include #include @@ -1489,24 +1489,24 @@ static void initialize_tun(void) } #endif -#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI const int kInitNetNsFd = 239; #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI || SYZ_NET_DEVICES #include #define DEVLINK_FAMILY_NAME "devlink" #define DEVLINK_CMD_PORT_GET 5 -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI #define DEVLINK_CMD_RELOAD 37 #endif #define DEVLINK_ATTR_BUS_NAME 1 #define DEVLINK_ATTR_DEV_NAME 2 #define DEVLINK_ATTR_NETDEV_NAME 7 -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI #define DEVLINK_ATTR_NETNS_FD 137 #endif @@ -1542,7 +1542,7 @@ static int netlink_devlink_id_get(struct nlmsg* nlmsg, int sock) return id; } -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI static void netlink_devlink_netns_move(const char* bus_name, const char* dev_name, int netns_fd) { struct genlmsghdr genlhdr; @@ -1624,7 +1624,7 @@ error: close(sock); } -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI static void initialize_devlink_pci(void) { #if SYZ_EXECUTOR @@ -1648,7 +1648,7 @@ static void initialize_devlink_pci(void) #endif #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES #include #include #include @@ -1820,7 +1820,7 @@ static void initialize_netdevices_init(void) } #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE && (__NR_syz_extract_tcp_res || SYZ_REPEAT) +#if SYZ_EXECUTOR || SYZ_NET_INJECTION && (__NR_syz_extract_tcp_res || SYZ_REPEAT) #include static int read_tun(char* data, int size) @@ -1840,7 +1840,7 @@ static int read_tun(char* data, int size) } #endif -#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_emit_ethernet && SYZ_NET_INJECTION #include #include @@ -1895,7 +1895,7 @@ static long syz_emit_ethernet(volatile long a0, volatile long a1, volatile long } #endif -#if SYZ_EXECUTOR || SYZ_REPEAT && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_REPEAT && SYZ_NET_INJECTION static void flush_tun() { #if SYZ_EXECUTOR @@ -1908,7 +1908,7 @@ static void flush_tun() } #endif -#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || __NR_syz_extract_tcp_res && SYZ_NET_INJECTION #ifndef __ANDROID__ struct ipv6hdr { __u8 priority : 4, @@ -1978,7 +1978,7 @@ static long syz_extract_tcp_res(volatile long a0, volatile long a1, volatile lon } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_CLOSE_FDS || __NR_syz_usb_connect +#if SYZ_EXECUTOR || SYZ_CLOSE_FDS || __NR_syz_usb_connect #define MAX_FDS 30 #endif @@ -2880,7 +2880,7 @@ static long syz_open_pts(volatile long a0, volatile long a1) #endif #if SYZ_EXECUTOR || __NR_syz_init_net_socket -#if SYZ_EXECUTOR || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_EXECUTOR || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID #include #include #include @@ -4137,7 +4137,7 @@ static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long #endif #endif -#if SYZ_EXECUTOR || SYZ_RESET_NET_NAMESPACE +#if SYZ_EXECUTOR || SYZ_NET_RESET #include #include #include @@ -4621,7 +4621,7 @@ static void reset_net_namespace(void) } #endif -#if SYZ_EXECUTOR || (SYZ_ENABLE_CGROUPS && (SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP)) +#if SYZ_EXECUTOR || (SYZ_CGROUPS && (SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID)) #include #include #include @@ -4756,7 +4756,7 @@ void initialize_cgroups() #endif #endif -#if SYZ_EXECUTOR || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_EXECUTOR || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID #include #include @@ -4765,7 +4765,7 @@ static void setup_common() if (mount(0, "/sys/fs/fuse/connections", "fusectl", 0, 0)) { debug("mount(fusectl) failed: %d\n", errno); } -#if SYZ_EXECUTOR || SYZ_ENABLE_CGROUPS +#if SYZ_EXECUTOR || SYZ_CGROUPS setup_cgroups(); #endif } @@ -4784,7 +4784,7 @@ static void sandbox_common() setpgrp(); setsid(); -#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI int netns = open("/proc/self/ns/net", O_RDONLY); if (netns == -1) fail("open(/proc/self/ns/net) failed"); @@ -4892,19 +4892,19 @@ static int do_sandbox_none(void) setup_common(); sandbox_common(); drop_caps(); -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices_init(); #endif if (unshare(CLONE_NEWNET)) { debug("unshare(CLONE_NEWNET): %d\n", errno); } -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI initialize_devlink_pci(); #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(); #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices(); #endif loop(); @@ -4929,19 +4929,19 @@ static int do_sandbox_setuid(void) setup_common(); sandbox_common(); -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices_init(); #endif if (unshare(CLONE_NEWNET)) { debug("unshare(CLONE_NEWNET): %d\n", errno); } -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI initialize_devlink_pci(); #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(); #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices(); #endif @@ -4977,18 +4977,18 @@ static int namespace_sandbox_proc(void* arg) if (!write_file("/proc/self/gid_map", "0 %d 1\n", real_gid)) fail("write of /proc/self/gid_map failed"); -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices_init(); #endif if (unshare(CLONE_NEWNET)) fail("unshare(CLONE_NEWNET)"); -#if SYZ_EXECUTOR || SYZ_ENABLE_DEVLINK_PCI +#if SYZ_EXECUTOR || SYZ_DEVLINK_PCI initialize_devlink_pci(); #endif -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(); #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices(); #endif @@ -5020,7 +5020,7 @@ static int namespace_sandbox_proc(void* arg) fail("mkdir failed"); if (mount("/sys", "./syz-tmp/newroot/sys", 0, bind_mount_flags, NULL)) fail("mount(sysfs) failed"); -#if SYZ_EXECUTOR || SYZ_ENABLE_CGROUPS +#if SYZ_EXECUTOR || SYZ_CGROUPS initialize_cgroups(); #endif if (mkdir("./syz-tmp/pivot", 0777)) @@ -5061,7 +5061,7 @@ static int do_sandbox_namespace(void) } #endif -#if SYZ_EXECUTOR || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_EXECUTOR || SYZ_SANDBOX_ANDROID #include #include #include @@ -5160,10 +5160,10 @@ static int do_sandbox_android_untrusted_app(void) syz_setfilecon(".", SELINUX_LABEL_APP_DATA_FILE); syz_setcon(SELINUX_CONTEXT_UNTRUSTED_APP); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION initialize_tun(); #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_NETDEV +#if SYZ_EXECUTOR || SYZ_NET_DEVICES initialize_netdevices_init(); initialize_netdevices(); #endif @@ -5275,7 +5275,7 @@ retry: } #endif -#if SYZ_EXECUTOR || SYZ_FAULT_INJECTION +#if SYZ_EXECUTOR || SYZ_FAULT #include #include #include @@ -5362,7 +5362,7 @@ static void kill_and_wait(int pid, int* status) } #endif -#if SYZ_EXECUTOR || SYZ_REPEAT && (SYZ_ENABLE_CGROUPS || SYZ_RESET_NET_NAMESPACE) +#if SYZ_EXECUTOR || SYZ_REPEAT && (SYZ_CGROUPS || SYZ_NET_RESET) #include #include #include @@ -5372,16 +5372,16 @@ static void kill_and_wait(int pid, int* status) #define SYZ_HAVE_SETUP_LOOP 1 static void setup_loop() { -#if SYZ_EXECUTOR || SYZ_ENABLE_CGROUPS +#if SYZ_EXECUTOR || SYZ_CGROUPS setup_cgroups_loop(); #endif -#if SYZ_EXECUTOR || SYZ_RESET_NET_NAMESPACE +#if SYZ_EXECUTOR || SYZ_NET_RESET checkpoint_net_namespace(); #endif } #endif -#if SYZ_EXECUTOR || SYZ_REPEAT && (SYZ_RESET_NET_NAMESPACE || __NR_syz_mount_image || __NR_syz_read_part_table) +#if SYZ_EXECUTOR || SYZ_REPEAT && (SYZ_NET_RESET || __NR_syz_mount_image || __NR_syz_read_part_table) #define SYZ_HAVE_RESET_LOOP 1 static void reset_loop() { @@ -5394,7 +5394,7 @@ static void reset_loop() close(loopfd); } #endif -#if SYZ_EXECUTOR || SYZ_RESET_NET_NAMESPACE +#if SYZ_EXECUTOR || SYZ_NET_RESET reset_net_namespace(); #endif } @@ -5408,17 +5408,17 @@ static void setup_test() { prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); setpgrp(); -#if SYZ_EXECUTOR || SYZ_ENABLE_CGROUPS +#if SYZ_EXECUTOR || SYZ_CGROUPS setup_cgroups_test(); #endif write_file("/proc/self/oom_score_adj", "1000"); -#if SYZ_EXECUTOR || SYZ_TUN_ENABLE +#if SYZ_EXECUTOR || SYZ_NET_INJECTION flush_tun(); #endif } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_CLOSE_FDS +#if SYZ_EXECUTOR || SYZ_CLOSE_FDS #define SYZ_HAVE_CLOSE_FDS 1 static void close_fds() { @@ -5432,7 +5432,7 @@ static void close_fds() } #endif -#if SYZ_EXECUTOR || SYZ_FAULT_INJECTION +#if SYZ_EXECUTOR || SYZ_FAULT #include static void setup_fault() @@ -5459,7 +5459,7 @@ static void setup_fault() } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_LEAK +#if SYZ_EXECUTOR || SYZ_LEAK #include #include #include @@ -5546,7 +5546,7 @@ static void check_leaks(void) } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_BINFMT_MISC +#if SYZ_EXECUTOR || SYZ_BINFMT_MISC #include #include #include @@ -5562,7 +5562,7 @@ static void setup_binfmt_misc() } #endif -#if SYZ_EXECUTOR || SYZ_ENABLE_KCSAN +#if SYZ_EXECUTOR || SYZ_KCSAN #define KCSAN_DEBUGFS_FILE "/sys/kernel/debug/kcsan" static void setup_kcsan() @@ -6014,7 +6014,7 @@ static void loop(void) #if SYZ_EXECUTOR || SYZ_USE_TMP_DIR remove_dir(cwdbuf); #endif -#if SYZ_ENABLE_LEAK +#if SYZ_LEAK check_leaks(); #endif } @@ -6032,7 +6032,7 @@ static void loop(void) /*RESULTS*/ -#if SYZ_THREADED || SYZ_REPEAT || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_THREADED || SYZ_REPEAT || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID #if SYZ_THREADED void execute_call(int call) #elif SYZ_REPEAT @@ -6063,40 +6063,40 @@ int main(void) /*MMAP_DATA*/ #endif -#if SYZ_ENABLE_BINFMT_MISC +#if SYZ_BINFMT_MISC setup_binfmt_misc(); #endif -#if SYZ_ENABLE_LEAK +#if SYZ_LEAK setup_leak(); #endif -#if SYZ_FAULT_INJECTION +#if SYZ_FAULT setup_fault(); #endif -#if SYZ_ENABLE_KCSAN +#if SYZ_KCSAN setup_kcsan(); #endif #if SYZ_HANDLE_SEGV install_segv_handler(); #endif -#if SYZ_PROCS +#if SYZ_MULTI_PROC for (procid = 0; procid < /*PROCS*/; procid++) { if (fork() == 0) { #endif -#if SYZ_USE_TMP_DIR || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP +#if SYZ_USE_TMP_DIR || SYZ_SANDBOX_ANDROID use_temporary_dir(); #endif /*SANDBOX_FUNC*/ #if SYZ_HAVE_CLOSE_FDS && !SYZ_THREADED && !SYZ_REPEAT && !SYZ_SANDBOX_NONE && \ - !SYZ_SANDBOX_SETUID && !SYZ_SANDBOX_NAMESPACE && !SYZ_SANDBOX_ANDROID_UNTRUSTED_APP + !SYZ_SANDBOX_SETUID && !SYZ_SANDBOX_NAMESPACE && !SYZ_SANDBOX_ANDROID close_fds(); #endif -#if SYZ_PROCS +#if SYZ_MULTI_PROC } } sleep(1000000); #endif -#if !SYZ_PROCS && !SYZ_REPEAT && SYZ_ENABLE_LEAK +#if !SYZ_MULTI_PROC && !SYZ_REPEAT && SYZ_LEAK check_leaks(); #endif return 0; -- cgit mrf-deployment