AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Fixed page size, fuzzer now does memory.

Browse source
This commit is contained in:
Erin 2023-07-26 03:27:31 +02:00
parent e07bfb2301
commit 19df4538d7
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hbvm/fuzz/fuzz_targets/vm.rs
View file

@ -10,10 +10,34 @@ use {
fuzz_target!(|data: &[u8]| {
if let Ok(mut vm) = Vm::<_, 16384>::new_validated(data, TestTrapHandler, Default::default()) {
let page = Box::into_raw(Box::<Page>::default());
unsafe {
vm.memory
.map(
page.cast(),
0,
hbvm::mem::paging::Permission::Write,
PageSize::Size4K,
)
.unwrap()
};
let _ = vm.run();
vm.memory.unmap(0).unwrap();
let _ = unsafe { Box::from_raw(page) };
}
});
#[repr(align(4096))]
struct Page([u8; 4096]);
impl Default for Page {
fn default() -> Self {
unsafe { std::mem::MaybeUninit::zeroed().assume_init() }
}
}
struct TestTrapHandler;
impl HandlePageFault for TestTrapHandler {
fn page_fault(

4
hbvm/src/mem/mod.rs
View file

@ -365,7 +365,7 @@ impl Iterator for AddrPageLookuper {
perm,
PageSize::from_lvl(lvl)?,
// In-page offset
self.addr as usize & ((1 << (lvl * 9 + 12)) - 1),
addr_extract_index(self.addr, lvl),
);
}
}
@ -393,7 +393,7 @@ impl Iterator for AddrPageLookuper {
/// the output of the function is unspecified (yes, it can also panic :)
pub fn addr_extract_index(addr: u64, lvl: u8) -> usize {
debug_assert!(lvl <= 4);
usize::try_from((addr >> (lvl * 9 + 12)) & ((1 << 9) - 1)).expect("?conradluget a better CPU")
usize::try_from((addr >> (lvl * 8 + 12)) & ((1 << 8) - 1)).expect("?conradluget a better CPU")
}
/// Page size