commit eb904300ec81b91c703a89189000a99f6344039a
author robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Thu Mar 12 04:50:58 2015 +0000
committer robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Thu Mar 12 04:50:58 2015 +0000
tree a5f97025518f374c492687bc6aef34e993861398
parent 7e4d0c5b9899a19e1358f6ec6ef0c81ce02f562e

Delete timer after use

linux/arch.c

diff --git a/linux/arch.c b/linux/arch.c
index 6271566..2d49782 100644
--- a/linux/arch.c
+++ b/linux/arch.c
@@ -175,18 +175,22 @@
     }
 }
 
-static void arch_setTimer(void)
+static void arch_removeTimer(timer_t * timerid)
 {
-    timer_t timerid;
+    timer_delete(*timerid);
+}
+
+static bool arch_setTimer(timer_t * timerid)
+{
     struct sigevent sevp = {
-        .sigev_value.sival_ptr = &timerid,
+        .sigev_value.sival_ptr = timerid,
         .sigev_signo = SIGALRM,
         .sigev_notify = SIGEV_THREAD_ID | SIGEV_SIGNAL,
         ._sigev_un._tid = syscall(__NR_gettid),
     };
-    if (timer_create(CLOCK_REALTIME, &sevp, &timerid) == -1) {
+    if (timer_create(CLOCK_REALTIME, &sevp, timerid) == -1) {
         LOGMSG_P(l_ERROR, "timer_create(CLOCK_REALTIME) failed");
-        return;
+        return false;
     }
     /* 
      * Kick in every 200ms, starting with the next second
@@ -195,8 +199,10 @@
         .it_value = {.tv_sec = 1,.tv_nsec = 0},
         .it_interval = {.tv_sec = 0,.tv_nsec = 200000000,},
     };
-    if (timer_settime(timerid, 0, &ts, NULL) == -1) {
+    if (timer_settime(*timerid, 0, &ts, NULL) == -1) {
         LOGMSG_P(l_ERROR, "timer_settime() failed");
+        timer_delete(*timerid);
+        return false;
     }
     sigset_t smask;
     sigemptyset(&smask);
@@ -209,10 +215,10 @@
     };
     if (sigaction(SIGALRM, &sa, NULL) == -1) {
         LOGMSG_P(l_ERROR, "sigaciton(SIGALRM) failed");
-        return;
+        return false;
     }
 
-    return;
+    return true;
 }
 
 static void arch_checkTimeLimit(honggfuzz_t * hfuzz, fuzzer_t * fuzzer)
@@ -228,7 +234,10 @@
 
 void arch_reapChild(honggfuzz_t * hfuzz, fuzzer_t * fuzzer)
 {
-    arch_setTimer();
+    timer_t timerid;
+    if (arch_setTimer(&timerid) == false) {
+        LOGMSG(l_FATAL, "Couldn't set timer");
+    }
 
     int perfFd[3];
     if (hfuzz->pid == 0) {
@@ -264,11 +273,11 @@
                 arch_perfAnalyze(hfuzz, fuzzer, perfFd);
             }
             LOGMSG(l_DEBUG, "No more processes to track");
+            arch_removeTimer(&timerid);
             return;
         }
         if (pid == -1) {
             LOGMSG_P(l_FATAL, "wait3() failed");
-            return;
         }
 
         if (hfuzz->pid == 0) {