diff --git a/libafl_qemu/build_linux.rs b/libafl_qemu/build_linux.rs index de33e80a4e..8c53b2d708 100644 --- a/libafl_qemu/build_linux.rs +++ b/libafl_qemu/build_linux.rs @@ -160,7 +160,7 @@ pub fn build() { //.arg("--as-static-lib") .arg("--as-shared-lib") .arg(&format!("--target-list={}-{}", cpu_target, target_suffix)) - .args(&["--disable-blobs", "--disable-bsd-user", "--disable-fdt"]) + .args(["--disable-blobs", "--disable-bsd-user", "--disable-fdt"]) .status() .expect("Configure failed"); #[cfg(not(feature = "usermode"))] @@ -210,7 +210,7 @@ pub fn build() { #[cfg(feature = "usermode")] Command::new("ld") - .current_dir(&out_dir_path) + .current_dir(out_dir_path) .arg("-o") .arg("libqemu-partially-linked.o") .arg("-r") @@ -284,7 +284,7 @@ pub fn build() { .expect("Partial linked failure"); Command::new("ar") - .current_dir(&out_dir_path) + .current_dir(out_dir_path) .arg("crus") .arg("libqemu-partially-linked.a") .arg("libqemu-partially-linked.o") @@ -354,11 +354,11 @@ pub fn build() { #[cfg(feature = "usermode")] { let qasan_dir = Path::new("libqasan"); - let qasan_dir = fs::canonicalize(&qasan_dir).unwrap(); + let qasan_dir = fs::canonicalize(qasan_dir).unwrap(); let src_dir = Path::new("src"); assert!(Command::new("make") - .current_dir(&out_dir_path) + .current_dir(out_dir_path) .env("CC", &cross_cc) .env("OUT_DIR", &target_dir) .arg("-C") @@ -368,7 +368,7 @@ pub fn build() { .expect("make failed") .success()); assert!(Command::new("make") - .current_dir(&out_dir_path) + .current_dir(out_dir_path) .env("CC", &cross_cc) .env("OUT_DIR", &target_dir) .arg("-C") diff --git a/libafl_qemu/src/emu.rs b/libafl_qemu/src/emu.rs index a3e5603d48..fcde0bd925 100644 --- a/libafl_qemu/src/emu.rs +++ b/libafl_qemu/src/emu.rs @@ -1,12 +1,12 @@ //! Expose QEMU user `LibAFL` C api to Rust +#[cfg(feature = "usermode")] +use core::ptr::copy_nonoverlapping; use core::{ convert::Into, ffi::c_void, ptr::{addr_of, addr_of_mut, null}, }; -#[cfg(feature = "usermode")] -use core::{mem::MaybeUninit, ptr::copy_nonoverlapping}; use std::{slice::from_raw_parts, str::from_utf8_unchecked}; #[cfg(feature = "usermode")] @@ -391,7 +391,7 @@ impl Iterator for GuestMaps { return None; } unsafe { - let mut ret: MapInfo = MaybeUninit::uninit().assume_init(); + let mut ret = core::mem::zeroed(); self.c_iter = libafl_maps_next(self.c_iter, addr_of_mut!(ret)); if self.c_iter.is_null() { None diff --git a/libafl_qemu/src/snapshot.rs b/libafl_qemu/src/snapshot.rs index 89867fcf4b..650717d1c0 100644 --- a/libafl_qemu/src/snapshot.rs +++ b/libafl_qemu/src/snapshot.rs @@ -85,7 +85,7 @@ impl QemuSnapshotHelper { }; if map.flags().is_w() { unsafe { - info.data = Some(Box::new(core::mem::MaybeUninit::uninit().assume_init())); + info.data = Some(Box::new(core::mem::zeroed())); emulator.read_mem(addr, &mut info.data.as_mut().unwrap()[..]); } }