commit d526d31c9c86779f0d245cb950726a2142bcce8e
author robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Thu Mar 12 02:12:50 2015 +0000
committer robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Thu Mar 12 02:12:50 2015 +0000
tree 5de961983a0f9f6dfdbf1daa40463432ddff58d2
parent 3213a1102ad0841dc8a65092dba32bdfdbb492e2

Attach to thread groups while fuzzing

linux/arch.c

diff --git a/linux/arch.c b/linux/arch.c
index f12f754..6271566 100644
--- a/linux/arch.c
+++ b/linux/arch.c
@@ -150,10 +150,10 @@
         putenv(hfuzz->envs[i]);
     }
 
-    if (!arch_ptraceEnable(hfuzz)) {
-        return false;
-    }
-
+/*
+ * Wait for the ptrace to attach
+ */
+    syscall(__NR_tkill, syscall(__NR_gettid), SIGSTOP);
     execvp(args[0], args);
 
     util_recoverStdio();
@@ -230,22 +230,27 @@
 {
     arch_setTimer();
 
-    int status;
-    pid_t pid = wait3(&status, __WNOTHREAD | __WALL | WUNTRACED, NULL);
-    if (pid == -1) {
-        LOGMSG(l_FATAL, "wait3() pid=-1");
-    }
-    if (!WIFSTOPPED(status)) {
-        LOGMSG(l_FATAL, "PID '%d' is not in a stopped state");
-    }
-
     int perfFd[3];
-    if (arch_perfEnable(pid, hfuzz, perfFd) == false) {
-        return;
+    if (hfuzz->pid == 0) {
+        int status;
+        pid_t pid = wait4(fuzzer->pid, &status, __WNOTHREAD | __WALL | WUNTRACED, NULL);
+        if (pid != pid) {
+            LOGMSG(l_FATAL, "wait4() =! pid (%d)", fuzzer->pid);
+        }
+        if (!WIFSTOPPED(status)) {
+            LOGMSG(l_FATAL, "PID '%d' is not in a stopped state", fuzzer->pid);
+        }
+        if (arch_ptraceAttach(fuzzer->pid) == false) {
+            LOGMSG(l_FATAL, "Couldn't attach to pid %d", fuzzer->pid);
+        }
+        if (arch_perfEnable(fuzzer->pid, hfuzz, perfFd) == false) {
+            LOGMSG(l_FATAL, "Couldn't enable perf counters for pid %d", fuzzer->pid);
+        }
+        arch_ptraceAnalyze(hfuzz, status, fuzzer->pid, fuzzer);
     }
-    arch_ptraceAnalyze(hfuzz, status, pid, fuzzer);
 
     for (;;) {
+        int status;
         pid_t pid = wait3(&status, __WNOTHREAD | __WALL | WUNTRACED, NULL);
 
         LOGMSG(l_DEBUG, "PID '%d' returned with status '%d'", pid, status);
@@ -255,7 +260,9 @@
             continue;
         }
         if (pid == -1 && errno == ECHILD) {
-            arch_perfAnalyze(hfuzz, fuzzer, perfFd);
+            if (hfuzz->pid == 0) {
+                arch_perfAnalyze(hfuzz, fuzzer, perfFd);
+            }
             LOGMSG(l_DEBUG, "No more processes to track");
             return;
         }
@@ -264,7 +271,9 @@
             return;
         }
 
-        arch_ptraceAnalyze(hfuzz, status, pid, fuzzer);
+        if (hfuzz->pid == 0) {
+            arch_ptraceAnalyze(hfuzz, status, pid, fuzzer);
+        }
     }
 }