try to fix forkserver

This commit is contained in:
Dominik Maier
2020-04-01 01:24:44 +02:00
parent d0d5518ea8
commit d73e63bd70
2 changed files with 9 additions and 4 deletions

View File

@ -153,8 +153,8 @@ endif
ifdef ASAN_BUILD
$(info Compiling ASAN version of binaries)
CFLAGS+=-fsanitize=address
LDFLAGS+=-fsanitize=address
CFLAGS+=-fsanitize=address -fstack-protector-strong
LDFLAGS+=-fsanitize=address -fstack-protector-strong
endif
ifdef PROFILING

View File

@ -319,10 +319,15 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv) {
u32 time = read_timed(fsrv->fsrv_st_fd, &status, rlen,
fsrv->exec_tmout * FORK_WAIT_MULT);
if (!time) {
if (time > fsrv->exec_tmout * FORK_WAIT_MULT) {
fsrv->child_timed_out = 1;
kill(fsrv->child_pid, SIGKILL);
kill(fsrv->fsrv_pid, SIGKILL);
}
if (!time) {
kill(fsrv->fsrv_pid, SIGKILL);
}