Merge pull request #685 from fitzgen/fuzzing-api-calls
fuzzing: Add initial API call fuzzer
This commit is contained in:
@@ -8,15 +8,28 @@
|
||||
//! wrapper over an external tool, such that the wrapper implements the
|
||||
//! `Arbitrary` trait for the wrapped external tool.
|
||||
|
||||
pub mod api;
|
||||
|
||||
use arbitrary::{Arbitrary, Unstructured};
|
||||
use std::fmt;
|
||||
|
||||
/// A Wasm test case generator that is powered by Binaryen's `wasm-opt -ttf`.
|
||||
#[derive(Debug)]
|
||||
#[derive(Clone)]
|
||||
pub struct WasmOptTtf {
|
||||
/// The raw, encoded Wasm bytes.
|
||||
pub wasm: Vec<u8>,
|
||||
}
|
||||
|
||||
impl fmt::Debug for WasmOptTtf {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(
|
||||
f,
|
||||
"WasmOptTtf {{ wasm: wat::parse_str(r###\"\n{}\n\"###).unwrap() }}",
|
||||
wasmprinter::print_bytes(&self.wasm).expect("valid wasm should always disassemble")
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl Arbitrary for WasmOptTtf {
|
||||
fn arbitrary<U>(input: &mut U) -> Result<Self, U::Error>
|
||||
where
|
||||
|
||||
182
crates/fuzzing/src/generators/api.rs
Normal file
182
crates/fuzzing/src/generators/api.rs
Normal file
@@ -0,0 +1,182 @@
|
||||
//! Generating sequences of Wasmtime API calls.
|
||||
//!
|
||||
//! We only generate *valid* sequences of API calls. To do this, we keep track
|
||||
//! of what objects we've already created in earlier API calls via the `Scope`
|
||||
//! struct.
|
||||
//!
|
||||
//! To generate even-more-pathological sequences of API calls, we use [swarm
|
||||
//! testing]:
|
||||
//!
|
||||
//! > In swarm testing, the usual practice of potentially including all features
|
||||
//! > in every test case is abandoned. Rather, a large “swarm” of randomly
|
||||
//! > generated configurations, each of which omits some features, is used, with
|
||||
//! > configurations receiving equal resources.
|
||||
//!
|
||||
//! [swarm testing]: https://www.cs.utah.edu/~regehr/papers/swarm12.pdf
|
||||
|
||||
use arbitrary::{Arbitrary, Unstructured};
|
||||
use std::collections::HashSet;
|
||||
|
||||
struct Swarm {
|
||||
config_debug_info: bool,
|
||||
module_new: bool,
|
||||
module_drop: bool,
|
||||
instance_new: bool,
|
||||
instance_drop: bool,
|
||||
call_exported_func: bool,
|
||||
}
|
||||
|
||||
impl Arbitrary for Swarm {
|
||||
fn arbitrary<U>(input: &mut U) -> Result<Self, U::Error>
|
||||
where
|
||||
U: Unstructured + ?Sized,
|
||||
{
|
||||
Ok(Swarm {
|
||||
config_debug_info: bool::arbitrary(input)?,
|
||||
module_new: bool::arbitrary(input)?,
|
||||
module_drop: bool::arbitrary(input)?,
|
||||
instance_new: bool::arbitrary(input)?,
|
||||
instance_drop: bool::arbitrary(input)?,
|
||||
call_exported_func: bool::arbitrary(input)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// A call to one of Wasmtime's public APIs.
|
||||
#[derive(Clone, Debug)]
|
||||
#[allow(missing_docs)]
|
||||
pub enum ApiCall {
|
||||
ConfigNew,
|
||||
ConfigDebugInfo(bool),
|
||||
EngineNew,
|
||||
StoreNew,
|
||||
ModuleNew { id: usize, wasm: super::WasmOptTtf },
|
||||
ModuleDrop { id: usize },
|
||||
InstanceNew { id: usize, module: usize },
|
||||
InstanceDrop { id: usize },
|
||||
CallExportedFunc { instance: usize, nth: usize },
|
||||
}
|
||||
use ApiCall::*;
|
||||
|
||||
#[derive(Default)]
|
||||
struct Scope {
|
||||
id_counter: usize,
|
||||
modules: HashSet<usize>,
|
||||
instances: HashSet<usize>,
|
||||
}
|
||||
|
||||
impl Scope {
|
||||
fn next_id(&mut self) -> usize {
|
||||
let id = self.id_counter;
|
||||
self.id_counter = id + 1;
|
||||
id
|
||||
}
|
||||
}
|
||||
|
||||
/// A sequence of API calls.
|
||||
#[derive(Debug)]
|
||||
pub struct ApiCalls {
|
||||
/// The API calls.
|
||||
pub calls: Vec<ApiCall>,
|
||||
}
|
||||
|
||||
impl Arbitrary for ApiCalls {
|
||||
fn arbitrary<U>(input: &mut U) -> Result<Self, U::Error>
|
||||
where
|
||||
U: Unstructured + ?Sized,
|
||||
{
|
||||
let swarm = Swarm::arbitrary(input)?;
|
||||
let mut calls = vec![];
|
||||
|
||||
arbitrary_config(input, &swarm, &mut calls)?;
|
||||
calls.push(EngineNew);
|
||||
calls.push(StoreNew);
|
||||
|
||||
let mut scope = Scope::default();
|
||||
|
||||
for _ in 0..input.container_size()? {
|
||||
let mut choices: Vec<fn(_, &mut Scope) -> Result<ApiCall, U::Error>> = vec![];
|
||||
|
||||
if swarm.module_new {
|
||||
choices.push(|input, scope| {
|
||||
let id = scope.next_id();
|
||||
scope.modules.insert(id);
|
||||
let wasm = super::WasmOptTtf::arbitrary(input)?;
|
||||
Ok(ModuleNew { id, wasm })
|
||||
});
|
||||
}
|
||||
if swarm.module_drop && !scope.modules.is_empty() {
|
||||
choices.push(|input, scope| {
|
||||
let modules: Vec<_> = scope.modules.iter().cloned().collect();
|
||||
let id = arbitrary_choice(input, &modules)?.cloned().unwrap();
|
||||
scope.modules.remove(&id);
|
||||
Ok(ModuleDrop { id })
|
||||
});
|
||||
}
|
||||
if swarm.instance_new && !scope.modules.is_empty() {
|
||||
choices.push(|input, scope| {
|
||||
let modules: Vec<_> = scope.modules.iter().cloned().collect();
|
||||
let module = arbitrary_choice(input, &modules)?.cloned().unwrap();
|
||||
let id = scope.next_id();
|
||||
scope.instances.insert(id);
|
||||
Ok(InstanceNew { id, module })
|
||||
});
|
||||
}
|
||||
if swarm.instance_drop && !scope.instances.is_empty() {
|
||||
choices.push(|input, scope| {
|
||||
let instances: Vec<_> = scope.instances.iter().cloned().collect();
|
||||
let id = arbitrary_choice(input, &instances)?.cloned().unwrap();
|
||||
scope.instances.remove(&id);
|
||||
Ok(InstanceDrop { id })
|
||||
});
|
||||
}
|
||||
if swarm.call_exported_func && !scope.instances.is_empty() {
|
||||
choices.push(|input, scope| {
|
||||
let instances: Vec<_> = scope.instances.iter().cloned().collect();
|
||||
let instance = arbitrary_choice(input, &instances)?.cloned().unwrap();
|
||||
let nth = usize::arbitrary(input)?;
|
||||
Ok(CallExportedFunc { instance, nth })
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(c) = arbitrary_choice(input, &choices)? {
|
||||
calls.push(c(input, &mut scope)?);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(ApiCalls { calls })
|
||||
}
|
||||
}
|
||||
|
||||
fn arbitrary_choice<'a, T, U>(input: &mut U, choices: &'a [T]) -> Result<Option<&'a T>, U::Error>
|
||||
where
|
||||
U: Unstructured + ?Sized,
|
||||
{
|
||||
if choices.is_empty() {
|
||||
Ok(None)
|
||||
} else {
|
||||
let i = usize::arbitrary(input)? % choices.len();
|
||||
Ok(Some(&choices[i]))
|
||||
}
|
||||
}
|
||||
|
||||
fn arbitrary_config<U>(
|
||||
input: &mut U,
|
||||
swarm: &Swarm,
|
||||
calls: &mut Vec<ApiCall>,
|
||||
) -> Result<(), U::Error>
|
||||
where
|
||||
U: Unstructured + ?Sized,
|
||||
{
|
||||
calls.push(ConfigNew);
|
||||
|
||||
if swarm.config_debug_info && bool::arbitrary(input)? {
|
||||
calls.push(ConfigDebugInfo(bool::arbitrary(input)?));
|
||||
}
|
||||
|
||||
// TODO: flags, features, and compilation strategy.
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -107,8 +107,12 @@ fn my_fuzzing_regression_test() {{
|
||||
}
|
||||
}
|
||||
|
||||
fn scratch_dir() -> PathBuf {
|
||||
pub(crate) fn scratch_dir() -> PathBuf {
|
||||
let dir = Path::new(env!("CARGO_MANIFEST_DIR"))
|
||||
// Pop "fuzzing".
|
||||
.join("..")
|
||||
// Pop "crates".
|
||||
.join("..")
|
||||
.join("target")
|
||||
.join("scratch");
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
pub mod dummy;
|
||||
|
||||
use dummy::dummy_imports;
|
||||
use dummy::{dummy_imports, dummy_value};
|
||||
use std::cell::RefCell;
|
||||
use std::collections::HashMap;
|
||||
use std::rc::Rc;
|
||||
use wasmtime::{Config, Engine, HostRef, Instance, Module, Store};
|
||||
use wasmtime::*;
|
||||
use wasmtime_environ::{isa, settings};
|
||||
use wasmtime_jit::{native, CompilationStrategy, CompiledModule, Compiler, NullResolver};
|
||||
|
||||
@@ -83,3 +83,127 @@ pub fn compile(wasm: &[u8], compilation_strategy: CompilationStrategy) {
|
||||
let global_exports = Rc::new(RefCell::new(HashMap::new()));
|
||||
let _ = CompiledModule::new(&mut compiler, wasm, &mut resolver, global_exports, false);
|
||||
}
|
||||
|
||||
/// Invoke the given API calls.
|
||||
pub fn make_api_calls(api: crate::generators::api::ApiCalls) {
|
||||
use crate::generators::api::ApiCall;
|
||||
|
||||
let mut config: Option<Config> = None;
|
||||
let mut engine: Option<HostRef<Engine>> = None;
|
||||
let mut store: Option<HostRef<Store>> = None;
|
||||
let mut modules: HashMap<usize, HostRef<Module>> = Default::default();
|
||||
let mut instances: HashMap<usize, HostRef<Instance>> = Default::default();
|
||||
|
||||
for call in api.calls {
|
||||
match call {
|
||||
ApiCall::ConfigNew => {
|
||||
assert!(config.is_none());
|
||||
config = Some(Config::new());
|
||||
}
|
||||
|
||||
ApiCall::ConfigDebugInfo(b) => {
|
||||
config.as_mut().unwrap().debug_info(b);
|
||||
}
|
||||
|
||||
ApiCall::EngineNew => {
|
||||
assert!(engine.is_none());
|
||||
engine = Some(HostRef::new(Engine::new(config.as_ref().unwrap())));
|
||||
}
|
||||
|
||||
ApiCall::StoreNew => {
|
||||
assert!(store.is_none());
|
||||
store = Some(HostRef::new(Store::new(engine.as_ref().unwrap())));
|
||||
}
|
||||
|
||||
ApiCall::ModuleNew { id, wasm } => {
|
||||
let module = HostRef::new(match Module::new(store.as_ref().unwrap(), &wasm.wasm) {
|
||||
Ok(m) => m,
|
||||
Err(_) => continue,
|
||||
});
|
||||
let old = modules.insert(id, module);
|
||||
assert!(old.is_none());
|
||||
}
|
||||
|
||||
ApiCall::ModuleDrop { id } => {
|
||||
drop(modules.remove(&id));
|
||||
}
|
||||
|
||||
ApiCall::InstanceNew { id, module } => {
|
||||
let module = match modules.get(&module) {
|
||||
Some(m) => m,
|
||||
None => continue,
|
||||
};
|
||||
|
||||
let imports = {
|
||||
let module = module.borrow();
|
||||
match dummy_imports(store.as_ref().unwrap(), module.imports()) {
|
||||
Ok(imps) => imps,
|
||||
Err(_) => {
|
||||
// There are some value types that we can't synthesize a
|
||||
// dummy value for (e.g. anyrefs) and for modules that
|
||||
// import things of these types we skip instantiation.
|
||||
continue;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Don't unwrap this: there can be instantiation-/link-time errors that
|
||||
// aren't caught during validation or compilation. For example, an imported
|
||||
// table might not have room for an element segment that we want to
|
||||
// initialize into it.
|
||||
if let Ok(instance) = Instance::new(store.as_ref().unwrap(), &module, &imports) {
|
||||
instances.insert(id, HostRef::new(instance));
|
||||
}
|
||||
}
|
||||
|
||||
ApiCall::InstanceDrop { id } => {
|
||||
drop(instances.remove(&id));
|
||||
}
|
||||
|
||||
ApiCall::CallExportedFunc { instance, nth } => {
|
||||
let instance = match instances.get(&instance) {
|
||||
Some(i) => i,
|
||||
None => {
|
||||
// Note that we aren't guaranteed to instantiate valid
|
||||
// modules, see comments in `InstanceNew` for details on
|
||||
// that. But the API call generator can't know if
|
||||
// instantiation failed, so we might not actually have
|
||||
// this instance. When that's the case, just skip the
|
||||
// API call and keep going.
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
let funcs = {
|
||||
let instance = instance.borrow();
|
||||
instance
|
||||
.exports()
|
||||
.iter()
|
||||
.filter_map(|e| match e {
|
||||
Extern::Func(f) => Some(f.clone()),
|
||||
_ => None,
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
};
|
||||
|
||||
if funcs.is_empty() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let nth = nth % funcs.len();
|
||||
let f = funcs[nth].borrow();
|
||||
let ty = f.r#type();
|
||||
let params = match ty
|
||||
.params()
|
||||
.iter()
|
||||
.map(|valty| dummy_value(valty))
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
{
|
||||
Ok(p) => p,
|
||||
Err(_) => continue,
|
||||
};
|
||||
let _ = f.call(¶ms);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user