SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Clippy fixes for QEMU (#757)

Browse Source
This commit is contained in:
Dominik Maier 2022-09-02 18:49:41 +02:00 committed by GitHub
parent 5823320206
commit 28194ac746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libafl_qemu/build_linux.rs
View File

@ -160,7 +160,7 @@ pub fn build() {
//.arg("--as-static-lib") //.arg("--as-static-lib")
.arg("--as-shared-lib") .arg("--as-shared-lib")
.arg(&format!("--target-list={}-{}", cpu_target, target_suffix)) .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() .status()
.expect("Configure failed"); .expect("Configure failed");
#[cfg(not(feature = "usermode"))] #[cfg(not(feature = "usermode"))]
@ -210,7 +210,7 @@ pub fn build() {
#[cfg(feature = "usermode")] #[cfg(feature = "usermode")]
Command::new("ld") Command::new("ld")
.current_dir(&out_dir_path) .current_dir(out_dir_path)
.arg("-o") .arg("-o")
.arg("libqemu-partially-linked.o") .arg("libqemu-partially-linked.o")
.arg("-r") .arg("-r")
@ -284,7 +284,7 @@ pub fn build() {
.expect("Partial linked failure"); .expect("Partial linked failure");
Command::new("ar") Command::new("ar")
.current_dir(&out_dir_path) .current_dir(out_dir_path)
.arg("crus") .arg("crus")
.arg("libqemu-partially-linked.a") .arg("libqemu-partially-linked.a")
.arg("libqemu-partially-linked.o") .arg("libqemu-partially-linked.o")
@ -354,11 +354,11 @@ pub fn build() {
#[cfg(feature = "usermode")] #[cfg(feature = "usermode")]
{ {
let qasan_dir = Path::new("libqasan"); 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"); let src_dir = Path::new("src");
assert!(Command::new("make") assert!(Command::new("make")
.current_dir(&out_dir_path) .current_dir(out_dir_path)
.env("CC", &cross_cc) .env("CC", &cross_cc)
.env("OUT_DIR", &target_dir) .env("OUT_DIR", &target_dir)
.arg("-C") .arg("-C")
@ -368,7 +368,7 @@ pub fn build() {
.expect("make failed") .expect("make failed")
.success()); .success());
assert!(Command::new("make") assert!(Command::new("make")
.current_dir(&out_dir_path) .current_dir(out_dir_path)
.env("CC", &cross_cc) .env("CC", &cross_cc)
.env("OUT_DIR", &target_dir) .env("OUT_DIR", &target_dir)
.arg("-C") .arg("-C")

6
libafl_qemu/src/emu.rs
View File

@ -1,12 +1,12 @@
//! Expose QEMU user `LibAFL` C api to Rust //! Expose QEMU user `LibAFL` C api to Rust
#[cfg(feature = "usermode")]
use core::ptr::copy_nonoverlapping;
use core::{ use core::{
convert::Into, convert::Into,
ffi::c_void, ffi::c_void,
ptr::{addr_of, addr_of_mut, null}, 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}; use std::{slice::from_raw_parts, str::from_utf8_unchecked};
#[cfg(feature = "usermode")] #[cfg(feature = "usermode")]
@ -391,7 +391,7 @@ impl Iterator for GuestMaps {
return None; return None;
} }
unsafe { 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)); self.c_iter = libafl_maps_next(self.c_iter, addr_of_mut!(ret));
if self.c_iter.is_null() { if self.c_iter.is_null() {
None None

2
libafl_qemu/src/snapshot.rs
View File

@ -85,7 +85,7 @@ impl QemuSnapshotHelper {
}; };
if map.flags().is_w() { if map.flags().is_w() {
unsafe { 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()[..]); emulator.read_mem(addr, &mut info.data.as_mut().unwrap()[..]);
} }
} }