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

Clippy fixes

Browse Source
This commit is contained in:
Andrea Fioraldi 2021-09-29 16:44:39 +02:00
parent c6f7c3b3a8
commit 9004add503
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libafl_qemu/src/emu.rs
View File

@ -51,17 +51,16 @@ impl SyscallHookResult {
#[new]
#[must_use]
pub fn new(value: Option<u64>) -> Self {
if let Some(v) = value {
Self {
retval: v,
skip_syscall: true,
}
} else {
value.map_or(
Self {
retval: 0,
skip_syscall: false,
}
}
},
|v| Self {
retval: v,
skip_syscall: true,
},
)
}
}
@ -69,17 +68,16 @@ impl SyscallHookResult {
impl SyscallHookResult {
#[must_use]
pub fn new(value: Option<u64>) -> Self {
if let Some(v) = value {
Self {
retval: v,
skip_syscall: true,
}
} else {
value.map_or(
Self {
retval: 0,
skip_syscall: false,
}
}
},
|v| Self {
retval: v,
skip_syscall: true,
},
)
}
}

61
libafl_qemu/src/lib.rs
View File

@ -42,7 +42,7 @@ static mut PY_SYSCALL_HOOK: Option<PyObject> = None;
#[cfg(all(target_os = "linux", feature = "python"))]
#[pymodule]
#[pyo3(name = "libafl_qemu")]
#[allow(clippy::items_after_statements)]
#[allow(clippy::items_after_statements, clippy::too_many_lines)]
pub fn python_module(py: Python, m: &PyModule) -> PyResult<()> {
use core::mem::transmute;
use pyo3::exceptions::PyValueError;
@ -126,28 +126,29 @@ pub fn python_module(py: Python, m: &PyModule) -> PyResult<()> {
a6: u64,
a7: u64,
) -> SyscallHookResult {
if let Some(obj) = unsafe { &PY_SYSCALL_HOOK } {
let args = (sys_num, a0, a1, a2, a3, a4, a5, a6, a7);
Python::with_gil(|py| {
let ret = obj.call1(py, args).expect("Error in the syscall hook");
let any = ret.as_ref(py);
if any.is_none() {
SyscallHookResult::new(None)
} else {
let a: Result<&PyInt, _> = any.try_into();
if let Ok(i) = a {
SyscallHookResult::new(Some(
i.extract().expect("Invalid syscall hook return value"),
))
unsafe { PY_SYSCALL_HOOK.as_ref() }.map_or_else(
|| SyscallHookResult::new(None),
|obj| {
let args = (sys_num, a0, a1, a2, a3, a4, a5, a6, a7);
Python::with_gil(|py| {
let ret = obj.call1(py, args).expect("Error in the syscall hook");
let any = ret.as_ref(py);
if any.is_none() {
SyscallHookResult::new(None)
} else {
SyscallHookResult::extract(any)
.expect("The syscall hook must return a SyscallHookResult")
let a: Result<&PyInt, _> = any.try_into();
if let Ok(i) = a {
SyscallHookResult::new(Some(
i.extract().expect("Invalid syscall hook return value"),
))
} else {
SyscallHookResult::extract(any)
.expect("The syscall hook must return a SyscallHookResult")
}
}
}
})
} else {
SyscallHookResult::new(None)
}
})
},
)
}
#[pyfn(m)]
fn set_syscall_hook(hook: PyObject) {
@ -157,26 +158,26 @@ pub fn python_module(py: Python, m: &PyModule) -> PyResult<()> {
emu::set_syscall_hook(py_syscall_hook_wrapper);
}
let child_module = PyModule::new(py, "x86")?;
let x86m = PyModule::new(py, "x86")?;
for r in x86::X86Regs::iter() {
let v: i32 = r.into();
child_module.add(&format!("{:?}", r), v)?;
x86m.add(&format!("{:?}", r), v)?;
}
m.add_submodule(child_module)?;
m.add_submodule(x86m)?;
let child_module = PyModule::new(py, "amd64")?;
let amd64m = PyModule::new(py, "amd64")?;
for r in amd64::Amd64Regs::iter() {
let v: i32 = r.into();
child_module.add(&format!("{:?}", r), v)?;
amd64m.add(&format!("{:?}", r), v)?;
}
m.add_submodule(child_module)?;
m.add_submodule(amd64m)?;
let child_module = PyModule::new(py, "mmap")?;
let mmapm = PyModule::new(py, "mmap")?;
for r in emu::MmapPerms::iter() {
let v: i32 = r.into();
child_module.add(&format!("{:?}", r), v)?;
mmapm.add(&format!("{:?}", r), v)?;
}
m.add_submodule(child_module)?;
m.add_submodule(mmapm)?;
m.add_class::<emu::MapInfo>()?;
m.add_class::<emu::GuestMaps>()?;