pkg/csource: support fuchsia

Lots of assorted heavylifting to support csource on fuchsia.

1 files changed, 26 insertions, 19 deletions

diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go
index 4bc98c820..2ab93fcfe 100644
--- a/pkg/csource/linux_common.go
+++ b/pkg/csource/linux_common.go
@@ -168,7 +168,8 @@ __attribute__((noreturn)) static void doexit(int status)
 #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)
+    defined(__NR_syz_kvm_setup_cpu) || defined(__NR_syz_init_net_socket) ||                     \
+    defined(__NR_syz_mmap)
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -226,7 +227,7 @@ struct call_t {
 #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_kvm_setup_cpu) || defined(__NR_syz_mmap)
 const int kFailStatus = 67;
 const int kRetryStatus = 69;
 #endif
@@ -235,11 +236,12 @@ const int kRetryStatus = 69;
 const int kErrorStatus = 68;
 #endif
 
-#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(__NR_syz_kvm_setup_cpu) || \
-    defined(__NR_syz_init_net_socket) &&                                                           \
-	(defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_SANDBOX_NAMESPACE))
+#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(__NR_syz_kvm_setup_cpu) ||      \
+    defined(__NR_syz_init_net_socket) &&                                                                \
+	(defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_SANDBOX_NAMESPACE)) || \
+    defined(__NR_syz_mmap)
 NORETURN PRINTF static void fail(const char* msg, ...)
 {
 	int e = errno;
@@ -2229,6 +2231,17 @@ static void sandbox_common()
 		debug("unshare(CLONE_SYSVSEM): %d\n", errno);
 	}
 }
+
+int wait_for_loop(int pid)
+{
+	if (pid < 0)
+		fail("sandbox fork failed");
+	debug("spawned loop pid %d\n", pid);
+	int status = 0;
+	while (waitpid(-1, &status, __WALL) != pid) {
+	}
+	return WEXITSTATUS(status);
+}
 #endif
 
 #if defined(SYZ_EXECUTOR) || defined(SYZ_SANDBOX_NONE)
@@ -2238,10 +2251,8 @@ static int do_sandbox_none(void)
 		debug("unshare(CLONE_NEWPID): %d\n", errno);
 	}
 	int pid = fork();
-	if (pid < 0)
-		fail("sandbox fork failed");
-	if (pid)
-		return pid;
+	if (pid <= 0)
+		return wait_for_loop(pid);
 
 #if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_CGROUPS)
 	setup_cgroups();
@@ -2268,10 +2279,8 @@ static int do_sandbox_setuid(void)
 	if (unshare(CLONE_NEWPID))
 		fail("unshare(CLONE_NEWPID)");
 	int pid = fork();
-	if (pid < 0)
-		fail("sandbox fork failed");
-	if (pid)
-		return pid;
+	if (pid <= 0)
+		return wait_for_loop(pid);
 
 #if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_CGROUPS)
 	setup_cgroups();
@@ -2420,9 +2429,7 @@ static int do_sandbox_namespace(void)
 	mprotect(sandbox_stack, 4096, PROT_NONE);
 	pid = clone(namespace_sandbox_proc, &sandbox_stack[sizeof(sandbox_stack) - 64],
 		    CLONE_NEWUSER | CLONE_NEWPID, 0);
-	if (pid < 0)
-		fail("sandbox clone failed");
-	return pid;
+	return wait_for_loop(pid);
 }
 #endif
 
@@ -3182,7 +3189,7 @@ static void execute(int num_calls)
 				ts.tv_sec = 0;
 				ts.tv_nsec = 20 * 1000 * 1000;
 				syscall(SYS_futex, &th->running, FUTEX_WAIT, 1, &ts);
-				if (running)
+				if (__atomic_load_n(&running, __ATOMIC_RELAXED))
 					usleep((call == num_calls - 1) ? 10000 : 1000);
 				break;
 			}