portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix opt_diff fuzzbugs

Browse source
This commit is contained in:
Chris Fallin 2023-02-24 22:01:33 -08:00
parent dc541497b2
commit fb719ff0d0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/interp.rs
View file

@ -9,6 +9,9 @@ use std::collections::HashMap;
mod wasi; mod wasi;
const WASM_PAGE: usize = 0x1_0000; // 64KiB
const MAX_PAGES: usize = 2048; // 2048 * 64KiB = 128MiB
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct InterpContext { pub struct InterpContext {
pub memories: PerEntity<Memory, InterpMemory>, pub memories: PerEntity<Memory, InterpMemory>,
@ -41,8 +44,8 @@ impl InterpContext {
let mut memories = PerEntity::default(); let mut memories = PerEntity::default();
for (memory, data) in module.memories.entries() { for (memory, data) in module.memories.entries() {
let mut interp_mem = InterpMemory { let mut interp_mem = InterpMemory {
data: vec![0; data.initial_pages * 0x1_0000], data: vec![0; data.initial_pages * WASM_PAGE],
max_pages: data.maximum_pages.unwrap_or(0x1_0000), max_pages: data.maximum_pages.unwrap_or(MAX_PAGES),
}; };
for segment in &data.segments { for segment in &data.segments {
let end = match segment.offset.checked_add(segment.data.len()) { let end = match segment.offset.checked_add(segment.data.len()) {
@ -928,16 +931,16 @@ pub fn const_eval(
} }
(Operator::MemorySize { mem }, []) => { (Operator::MemorySize { mem }, []) => {
ctx.map(|global| ConstVal::I32((global.memories[*mem].data.len() / 0x1_0000) as u32)) ctx.map(|global| ConstVal::I32((global.memories[*mem].data.len() / WASM_PAGE) as u32))
} }
(Operator::MemoryGrow { mem }, [ConstVal::I32(amount)]) => ctx.and_then(|global| { (Operator::MemoryGrow { mem }, [ConstVal::I32(amount)]) => ctx.and_then(|global| {
let cur_pages = global.memories[*mem].data.len() / 0x1_0000; let cur_pages = global.memories[*mem].data.len() / WASM_PAGE;
let new_pages = cur_pages + (*amount as usize); let new_pages = cur_pages + (*amount as usize);
if new_pages > global.memories[*mem].max_pages { if new_pages > global.memories[*mem].max_pages || new_pages > MAX_PAGES {
None None
} else { } else {
global.memories[*mem].data.resize(new_pages * 0x1_0000, 0); global.memories[*mem].data.resize(new_pages * WASM_PAGE, 0);
Some(ConstVal::I32(cur_pages as u32)) Some(ConstVal::I32(cur_pages as u32))
} }
}), }),