From bbd5104f064535a3da6bb3c21b826d645620db19 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 5 Mar 2018 12:59:12 +0100
Subject: executor: fix includes

We use errno, vaargs, printf in all of fail/error/exitf,
but we include the corresponding headers only when SYZ_USE_TMP_DIR.
Include them whenever fail/error/exitf are used.
---
 executor/common.h             | 7 ++++++-
 pkg/csource/akaros_common.go  | 7 ++++++-
 pkg/csource/freebsd_common.go | 7 ++++++-
 pkg/csource/linux_common.go   | 7 ++++++-
 pkg/csource/netbsd_common.go  | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/executor/common.h b/executor/common.h
index 1a0f9ecce..21fb31e9a 100644
--- a/executor/common.h
+++ b/executor/common.h
@@ -5,10 +5,15 @@
 
 #include <stdint.h>
 #include <string.h>
-#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
+#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) ||               \
+    defined(SYZ_USE_TMP_DIR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_SANDBOX_NAMESPACE) ||    \
+    defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_FAULT_INJECTION) || \
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#endif
+#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
 #include <stdlib.h>
 #include <sys/stat.h>
 #endif
diff --git a/pkg/csource/akaros_common.go b/pkg/csource/akaros_common.go
index c0984ed99..f86d175d1 100644
--- a/pkg/csource/akaros_common.go
+++ b/pkg/csource/akaros_common.go
@@ -47,10 +47,15 @@ __attribute__((noreturn)) static void doexit(int status)
 
 #include <stdint.h>
 #include <string.h>
-#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
+#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) ||               \
+    defined(SYZ_USE_TMP_DIR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_SANDBOX_NAMESPACE) ||    \
+    defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_FAULT_INJECTION) || \
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#endif
+#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
 #include <stdlib.h>
 #include <sys/stat.h>
 #endif
diff --git a/pkg/csource/freebsd_common.go b/pkg/csource/freebsd_common.go
index 1e6597bbc..e5dc7376b 100644
--- a/pkg/csource/freebsd_common.go
+++ b/pkg/csource/freebsd_common.go
@@ -38,10 +38,15 @@ __attribute__((noreturn)) static void doexit(int status)
 
 #include <stdint.h>
 #include <string.h>
-#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
+#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) ||               \
+    defined(SYZ_USE_TMP_DIR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_SANDBOX_NAMESPACE) ||    \
+    defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_FAULT_INJECTION) || \
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#endif
+#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
 #include <stdlib.h>
 #include <sys/stat.h>
 #endif
diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go
index ee92f9fe5..a042b5a19 100644
--- a/pkg/csource/linux_common.go
+++ b/pkg/csource/linux_common.go
@@ -139,10 +139,15 @@ __attribute__((noreturn)) static void doexit(int status)
 
 #include <stdint.h>
 #include <string.h>
-#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
+#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) ||               \
+    defined(SYZ_USE_TMP_DIR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_SANDBOX_NAMESPACE) ||    \
+    defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_FAULT_INJECTION) || \
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#endif
+#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
 #include <stdlib.h>
 #include <sys/stat.h>
 #endif
diff --git a/pkg/csource/netbsd_common.go b/pkg/csource/netbsd_common.go
index 3714f29da..7f22f3b53 100644
--- a/pkg/csource/netbsd_common.go
+++ b/pkg/csource/netbsd_common.go
@@ -38,10 +38,15 @@ __attribute__((noreturn)) static void doexit(int status)
 
 #include <stdint.h>
 #include <string.h>
-#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
+#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) ||               \
+    defined(SYZ_USE_TMP_DIR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_SANDBOX_NAMESPACE) ||    \
+    defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_FAULT_INJECTION) || \
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#endif
+#if defined(SYZ_EXECUTOR) || defined(SYZ_USE_TMP_DIR)
 #include <stdlib.h>
 #include <sys/stat.h>
 #endif
-- 
cgit mrf-deployment