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

Update QEMU and fix snapshot restore mem leak (#998)

Browse Source 
* Update qemu

* Fix leak

* upd

* fmt
This commit is contained in:
Andrea Fioraldi 2023-01-17 11:06:31 +01:00 committed by GitHub
parent 97e88af0c5
commit 7cf7d545a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libafl_qemu/libafl_qemu_build/src/bindings.rs
View File

@ -17,6 +17,10 @@ const WRAPPER_HEADER: &str = r#"
#define QEMU_BUILD_BUG_ON(x) #define QEMU_BUILD_BUG_ON(x)
#define QEMU_BUILD_BUG_ON_ZERO(x) #define QEMU_BUILD_BUG_ON_ZERO(x)
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
#endif
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"

10
libafl_qemu/libafl_qemu_build/src/build.rs
View File

@ -8,7 +8,7 @@ use which::which;
const QEMU_URL: &str = "https://github.com/AFLplusplus/qemu-libafl-bridge"; const QEMU_URL: &str = "https://github.com/AFLplusplus/qemu-libafl-bridge";
const QEMU_DIRNAME: &str = "qemu-libafl-bridge"; const QEMU_DIRNAME: &str = "qemu-libafl-bridge";
const QEMU_REVISION: &str = "e5424c34d223c2b638af6e4c9eef039db8b69dd4"; const QEMU_REVISION: &str = "f49d184a90e766d4d4f409160acb6b6c645156cf";
fn build_dep_check(tools: &[&str]) { fn build_dep_check(tools: &[&str]) {
for tool in tools { for tool in tools {
@ -138,12 +138,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([ .args(["--disable-bsd-user", "--disable-fdt", "--disable-system"]);
"--disable-blobs",
"--disable-bsd-user",
"--disable-fdt",
"--disable-system",
]);
if cfg!(feature = "debug_assertions") { if cfg!(feature = "debug_assertions") {
cmd.arg("--enable-debug"); cmd.arg("--enable-debug");
} }
@ -165,7 +160,6 @@ pub fn build(
.arg("--disable-attr") .arg("--disable-attr")
.arg("--disable-auth-pam") .arg("--disable-auth-pam")
.arg("--disable-dbus-display") .arg("--disable-dbus-display")
.arg("--disable-blobs")
.arg("--disable-bochs") .arg("--disable-bochs")
.arg("--disable-bpf") .arg("--disable-bpf")
.arg("--disable-brlapi") .arg("--disable-brlapi")