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

libafl_qemu: enable systemmode snapshots, vm_start

Browse Source 
Re-enable snapshot functions.
Start the VM before qemu_main_loop.
This commit is contained in:
Alwin Berger 2022-11-07 21:03:12 +01:00
parent 7fac8f9540
commit 2bf590e03f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libafl_qemu/src/emu.rs
View File

@ -7,7 +7,7 @@ use core::{
}; };
#[cfg(emulation_mode = "usermode")] #[cfg(emulation_mode = "usermode")]
use core::{mem::MaybeUninit, ptr::copy_nonoverlapping}; use core::{mem::MaybeUninit, ptr::copy_nonoverlapping};
use std::{slice::from_raw_parts, str::from_utf8_unchecked}; use std::{ffi::CString, slice::from_raw_parts, str::from_utf8_unchecked};
#[cfg(emulation_mode = "usermode")] #[cfg(emulation_mode = "usermode")]
use libc::c_int; use libc::c_int;
@ -226,6 +226,7 @@ extern "C" {
extern "C" { extern "C" {
fn qemu_init(argc: i32, argv: *const *const u8, envp: *const *const u8); fn qemu_init(argc: i32, argv: *const *const u8, envp: *const *const u8);
fn vm_start();
fn qemu_main_loop(); fn qemu_main_loop();
fn qemu_cleanup(); fn qemu_cleanup();
@ -244,11 +245,9 @@ extern "C" {
static mut libafl_start_vcpu: extern "C" fn(cpu: CPUStatePtr); static mut libafl_start_vcpu: extern "C" fn(cpu: CPUStatePtr);
/*
fn libafl_save_qemu_snapshot(name: *const u8); fn libafl_save_qemu_snapshot(name: *const u8);
#[allow(unused)] #[allow(unused)]
fn libafl_load_qemu_snapshot(name: *const u8); fn libafl_load_qemu_snapshot(name: *const u8);
*/
} }
#[cfg(emulation_mode = "systemmode")] #[cfg(emulation_mode = "systemmode")]
@ -723,7 +722,10 @@ impl Emulator {
#[cfg(emulation_mode = "usermode")] #[cfg(emulation_mode = "usermode")]
libafl_qemu_run(); libafl_qemu_run();
#[cfg(emulation_mode = "systemmode")] #[cfg(emulation_mode = "systemmode")]
qemu_main_loop(); {
vm_start();
qemu_main_loop();
}
} }
#[cfg(emulation_mode = "usermode")] #[cfg(emulation_mode = "usermode")]
@ -910,7 +912,7 @@ impl Emulator {
} }
} }
/*#[cfg(emulation_mode = "systemmode")] #[cfg(emulation_mode = "systemmode")]
pub fn save_snapshot(&self, name: &str) { pub fn save_snapshot(&self, name: &str) {
let s = CString::new(name).expect("Invalid snapshot name"); let s = CString::new(name).expect("Invalid snapshot name");
unsafe { libafl_save_qemu_snapshot(s.as_ptr() as *const _) }; unsafe { libafl_save_qemu_snapshot(s.as_ptr() as *const _) };
@ -920,7 +922,7 @@ impl Emulator {
pub fn load_snapshot(&self, name: &str) { pub fn load_snapshot(&self, name: &str) {
let s = CString::new(name).expect("Invalid snapshot name"); let s = CString::new(name).expect("Invalid snapshot name");
unsafe { libafl_load_qemu_snapshot(s.as_ptr() as *const _) }; unsafe { libafl_load_qemu_snapshot(s.as_ptr() as *const _) };
}*/ }
#[cfg(emulation_mode = "usermode")] #[cfg(emulation_mode = "usermode")]
pub fn set_pre_syscall_hook( pub fn set_pre_syscall_hook(