about summary refs log tree commit diff
path: root/src/afl-tmin.c
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2022-10-29 15:12:07 +0200
committerGitHub <noreply@github.com>2022-10-29 15:12:07 +0200
commit2d640558a09b03e9416b5d87e98cf938b38def9e (patch)
tree36490ea5c663cc5b4f8e3bb94ccfae22c734cf69 /src/afl-tmin.c
parent340647c5f1dda67957cf9f85b2af9e9ef7fb28af (diff)
parentec19a9b06881b6e69e5d15ea3fba527a0b53fd55 (diff)
downloadafl++-2d640558a09b03e9416b5d87e98cf938b38def9e.tar.gz
Merge pull request #1573 from AFLplusplus/dev
push to stable
Diffstat (limited to 'src/afl-tmin.c')
-rw-r--r--src/afl-tmin.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/afl-tmin.c b/src/afl-tmin.c
index 3a27b879..d93b9a41 100644
--- a/src/afl-tmin.c
+++ b/src/afl-tmin.c
@@ -879,11 +879,12 @@ static void usage(u8 *argv0) {
 
       "Environment variables used:\n"
       "AFL_CRASH_EXITCODE: optional child exit code to be interpreted as crash\n"
-      "AFL_FORKSRV_INIT_TMOUT: time spent waiting for forkserver during startup (in milliseconds)\n"
-      "AFL_KILL_SIGNAL: Signal ID delivered to child processes on timeout, etc. (default: SIGKILL)\n"
-      "AFL_FORK_SERVER_KILL_SIGNAL: Signal delivered to fork server processes on termination\n"
-      "                             (default: SIGTERM). If this is not set and AFL_KILL_SIGNAL is set,\n"
-      "                             this will be set to the same value as AFL_KILL_SIGNAL.\n"
+      "AFL_FORKSRV_INIT_TMOUT: time spent waiting for forkserver during startup (in ms)\n"
+      "AFL_KILL_SIGNAL: Signal ID delivered to child processes on timeout, etc.\n"
+      "                 (default: SIGKILL)\n"
+      "AFL_FORK_SERVER_KILL_SIGNAL: Kill signal for the fork server on termination\n"
+      "                             (default: SIGTERM). If unset and AFL_KILL_SIGNAL is\n"
+      "                             set, that value will be used.\n"
       "AFL_MAP_SIZE: the shared memory size for that target. must be >= the size\n"
       "              the target was compiled for\n"
       "AFL_PRELOAD:  LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n"
@@ -1198,7 +1199,8 @@ int main(int argc, char **argv_orig, char **envp) {
 
   }
 
-  configure_afl_kill_signals(fsrv, NULL, NULL);
+  configure_afl_kill_signals(
+      fsrv, NULL, NULL, (fsrv->qemu_mode || unicorn_mode) ? SIGKILL : SIGTERM);
 
   if (getenv("AFL_CRASH_EXITCODE")) {