about summary refs log tree commit diff
path: root/src/afl-fuzz.c
diff options
context:
space:
mode:
authorNils Bars <nils.bars@rub.de>2022-10-20 13:14:29 +0200
committerNils Bars <nils.bars@rub.de>2022-10-20 18:08:07 +0200
commitf84ea696606b3dd6ae40006e5efb9f178651e916 (patch)
tree3989c18c5f2705925d012b1ca4a6bd3bfa9f2c83 /src/afl-fuzz.c
parent5ccf38941472bda9415d14edc4ecefaa43c79d67 (diff)
downloadafl++-f84ea696606b3dd6ae40006e5efb9f178651e916.tar.gz
Fix child reaping on fuzzer termination
This commit contains the following changes:
    - Call `waitpid()` on the child and the fork server when terminating the
      fuzzer; thus, we do not end up with zombies.
    - Rename `fsrv.kill_signal` to `fsrv.child_kill_signal`, since the
      documentation states that the signal is used to terminate the *child*.
    - Use SIGTERM instead of fsrv.(child)_kill_signal, thus the fork server
      can always reap the child.
Diffstat (limited to 'src/afl-fuzz.c')
-rw-r--r--src/afl-fuzz.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index d116822a..c9eeeca1 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1358,7 +1358,7 @@ int main(int argc, char **argv_orig, char **envp) {
 
   #endif
 
-  afl->fsrv.kill_signal =
+  afl->fsrv.child_kill_signal =
       parse_afl_kill_signal_env(afl->afl_env.afl_kill_signal, SIGKILL);
 
   setup_signal_handlers();
@@ -2683,4 +2683,3 @@ stop_fuzzing:
 }
 
 #endif                                                          /* !AFL_LIB */
-