diff --git a/fuzzers/fuzzbench/src/lib.rs b/fuzzers/fuzzbench/src/lib.rs index 0946984bbe..ebe2f19fda 100644 --- a/fuzzers/fuzzbench/src/lib.rs +++ b/fuzzers/fuzzbench/src/lib.rs @@ -53,7 +53,7 @@ use libafl_targets::{ libfuzzer_initialize, libfuzzer_test_one_input, std_edges_map_observer, CmpLogObserver, }; #[cfg(unix)] -use nix::{self, unistd::dup}; +use nix::unistd::dup; /// The fuzzer main (as `no_mangle` C function) #[no_mangle] diff --git a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs index 4ffd6be305..2a42077042 100644 --- a/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs +++ b/fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs @@ -55,7 +55,7 @@ use libafl_qemu::{ QemuShutdownCause, Regs, }; #[cfg(unix)] -use nix::{self, unistd::dup}; +use nix::unistd::dup; /// The fuzzer main pub fn main() { diff --git a/fuzzers/fuzzbench_qemu/src/fuzzer.rs b/fuzzers/fuzzbench_qemu/src/fuzzer.rs index bbc4cd16a0..9254ec4ecc 100644 --- a/fuzzers/fuzzbench_qemu/src/fuzzer.rs +++ b/fuzzers/fuzzbench_qemu/src/fuzzer.rs @@ -65,7 +65,7 @@ use libafl_qemu::{ Regs, }; #[cfg(unix)] -use nix::{self, unistd::dup}; +use nix::unistd::dup; pub const MAX_INPUT_SIZE: usize = 1048576; // 1MB diff --git a/fuzzers/fuzzbench_text/src/lib.rs b/fuzzers/fuzzbench_text/src/lib.rs index ead2906460..b0488a0b6e 100644 --- a/fuzzers/fuzzbench_text/src/lib.rs +++ b/fuzzers/fuzzbench_text/src/lib.rs @@ -59,7 +59,7 @@ use libafl_targets::{ libfuzzer_initialize, libfuzzer_test_one_input, std_edges_map_observer, CmpLogObserver, }; #[cfg(unix)] -use nix::{self, unistd::dup}; +use nix::unistd::dup; /// The fuzzer main (as `no_mangle` C function) #[no_mangle] diff --git a/libafl/src/executors/hooks/timer.rs b/libafl/src/executors/hooks/timer.rs index 632a82dbab..f81202f191 100644 --- a/libafl/src/executors/hooks/timer.rs +++ b/libafl/src/executors/hooks/timer.rs @@ -325,6 +325,7 @@ impl TimerStruct { if self.batch_mode { unsafe { let elapsed = current_time().saturating_sub(self.tmout_start_time); + let elapsed_since_signal = current_time().saturating_sub(self.tmout_start_time); // elapsed may be > than tmout in case of received but ingored signal if elapsed > self.exec_tmout || self.exec_tmout.saturating_sub(elapsed) < self.avg_exec_time * self.avg_mul_k @@ -337,8 +338,7 @@ impl TimerStruct { self.executions = 0; } // readjust K - if self.last_signal_time > self.exec_tmout * self.avg_mul_k - && self.avg_mul_k > 1 + if elapsed_since_signal > self.exec_tmout * self.avg_mul_k && self.avg_mul_k > 1 { self.avg_mul_k -= 1; }