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.
This commit is contained in:
Nils Bars
2022-10-20 13:14:29 +02:00
parent 5ccf389414
commit f84ea69660
9 changed files with 26 additions and 28 deletions

View File

@ -129,7 +129,7 @@ static void kill_child() {
timed_out = 1;
if (fsrv->child_pid > 0) {
kill(fsrv->child_pid, fsrv->kill_signal);
kill(fsrv->child_pid, fsrv->child_kill_signal);
fsrv->child_pid = -1;
}
@ -1258,7 +1258,7 @@ int main(int argc, char **argv_orig, char **envp) {
: 0);
be_quiet = save_be_quiet;
fsrv->kill_signal =
fsrv->child_kill_signal =
parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL);
if (new_map_size) {
@ -1472,4 +1472,3 @@ int main(int argc, char **argv_orig, char **envp) {
exit(ret);
}