aboutsummaryrefslogtreecommitdiffstats
path: root/executor
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-11-14 17:14:29 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-11-16 09:58:54 +0100
commit531b5368e2d232cc2697bc555dc481143ced0ca0 (patch)
treee9607acef9720941227ebdb12f92f67d165bd231 /executor
parent8d85129b3cff7398f5aba861f0049afffb566865 (diff)
executor: remove pointless macro checks
common_bsd.h is used for 3 OSes, so checking if it's any of these 3 OSes is pointless. Remove these checks.
Diffstat (limited to 'executor')
-rw-r--r--executor/common_bsd.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/executor/common_bsd.h b/executor/common_bsd.h
index 95f08bcc5..85db5adf2 100644
--- a/executor/common_bsd.h
+++ b/executor/common_bsd.h
@@ -37,8 +37,6 @@ static uintptr_t syz_open_pts(void)
#endif // GOOS_openbsd
-#if GOOS_freebsd || GOOS_openbsd || GOOS_netbsd
-
#if SYZ_EXECUTOR || SYZ_TUN_ENABLE
#include <fcntl.h>
@@ -312,7 +310,6 @@ static long syz_extract_tcp_res(volatile long a0, volatile long a1, volatile lon
return 0;
}
#endif
-#endif // GOOS_freebsd || GOOS_openbsd
#if SYZ_EXECUTOR || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NONE
@@ -354,7 +351,7 @@ static void loop();
static int do_sandbox_none(void)
{
sandbox_common();
-#if (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && (SYZ_EXECUTOR || SYZ_TUN_ENABLE)
+#if SYZ_EXECUTOR || SYZ_TUN_ENABLE
initialize_tun(procid);
#endif
loop();
@@ -389,7 +386,7 @@ static int do_sandbox_setuid(void)
return wait_for_loop(pid);
sandbox_common();
-#if (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && (SYZ_EXECUTOR || SYZ_TUN_ENABLE)
+#if SYZ_EXECUTOR || SYZ_TUN_ENABLE
initialize_tun(procid);
#endif