ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-21 13:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to memmap2 (#428)

Browse Source 
- Depend on `memmap2`, a maintained fork of the abandoned `memmap` crate
- Revert #364, which temporarily suppressed the relevant `cargo-audit` CI error

Closes #363.
This commit is contained in:
Joe Ranweiler
2021-01-12 09:08:48 -08:00
committed by GitHub
parent f5dc8ad285
commit 70d41d1cc5
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/agent/Cargo.lock generated
View File

@ -399,7 +399,7 @@ dependencies = [
"goblin", "goblin",
"iced-x86", "iced-x86",
"log", "log",
"memmap", "memmap2",
"object", "object",
"pdb", "pdb",
"pete", "pete",
@ -520,7 +520,7 @@ dependencies = [
"goblin", "goblin",
"iced-x86", "iced-x86",
"log", "log",
"memmap", "memmap2",
"serde", "serde",
"win-util", "win-util",
"winapi 0.3.9", "winapi 0.3.9",
@ -1301,13 +1301,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]] [[package]]
name = "memmap" name = "memmap2"
version = "0.7.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee"
dependencies = [ dependencies = [
"libc", "libc",
"winapi 0.3.9",
] ]
[[package]] [[package]]

2
src/agent/coverage/Cargo.toml
View File

@ -13,7 +13,7 @@ fixedbitset = "0.3"
goblin = "0.2" goblin = "0.2"
iced-x86 = { version = "1.1", features = ["decoder", "op_code_info", "instr_info", "masm"] } iced-x86 = { version = "1.1", features = ["decoder", "op_code_info", "instr_info", "masm"] }
log = "0.4" log = "0.4"
memmap = "0.7" memmap2 = "0.2.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
uuid = { version = "0.8", features = ["guid"] } uuid = { version = "0.8", features = ["guid"] }

2
src/agent/coverage/src/pe.rs
View File

@ -9,7 +9,7 @@ use anyhow::Result;
use fixedbitset::FixedBitSet; use fixedbitset::FixedBitSet;
use goblin::pe::{debug::DebugData, PE}; use goblin::pe::{debug::DebugData, PE};
use log::trace; use log::trace;
use memmap::Mmap; use memmap2::Mmap;
use pdb::{ use pdb::{
AddressMap, FallibleIterator, PdbInternalSectionOffset, ProcedureSymbol, TypeIndex, PDB, AddressMap, FallibleIterator, PdbInternalSectionOffset, ProcedureSymbol, TypeIndex, PDB,
}; };

2
src/agent/debugger/Cargo.toml
View File

@ -11,7 +11,7 @@ fnv = "1.0"
goblin = "0.2" goblin = "0.2"
iced-x86 = "1.1" iced-x86 = "1.1"
log = "0.4" log = "0.4"
memmap = "0.7" memmap2 = "0.2.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
win-util = { path = "../win-util" } win-util = { path = "../win-util" }

2
src/agent/debugger/src/target.rs
View File

@ -671,7 +671,7 @@ struct ImageDetails {
fn get_image_details(path: &Path) -> Result<ImageDetails> { fn get_image_details(path: &Path) -> Result<ImageDetails> {
let file = fs::File::open(path)?; let file = fs::File::open(path)?;
let map = unsafe { memmap::Mmap::map(&file)? }; let map = unsafe { memmap2::Mmap::map(&file)? };
let header = goblin::pe::header::Header::parse(&map)?; let header = goblin::pe::header::Header::parse(&map)?;
let image_size = header let image_size = header

2
src/ci/agent.sh
View File

@ -19,7 +19,7 @@ cargo fmt -- --check
# RUSTSEC-2019-0031: a dependency spin (pulled in from ring) is not actively maintained # RUSTSEC-2019-0031: a dependency spin (pulled in from ring) is not actively maintained
# RUSTSEC-2020-0016: a dependency net2 (pulled in from tokio) is deprecated # RUSTSEC-2020-0016: a dependency net2 (pulled in from tokio) is deprecated
# RUSTSEC-2020-0036: a dependency failure (pulled from proc-maps) is deprecated # RUSTSEC-2020-0036: a dependency failure (pulled from proc-maps) is deprecated
cargo audit --deny warnings --deny unmaintained --deny unsound --deny yanked --ignore RUSTSEC-2019-0031 --ignore RUSTSEC-2020-0016 --ignore RUSTSEC-2020-0036 --ignore RUSTSEC-2020-0077 cargo audit --deny warnings --deny unmaintained --deny unsound --deny yanked --ignore RUSTSEC-2019-0031 --ignore RUSTSEC-2020-0016 --ignore RUSTSEC-2020-0036
cargo-license -j > data/licenses.json cargo-license -j > data/licenses.json
cargo build --release --locked cargo build --release --locked
# export RUST_LOG=trace # export RUST_LOG=trace