T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from memmap to memmap2.

Browse Source 
See https://rustsec.org/advisories/RUSTSEC-2020-0077
This commit is contained in:
Dan Gohman
2021-02-16 11:55:27 -08:00
parent d598883f3a
commit b396f6dc6f
5 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@@ -572,7 +572,7 @@ dependencies = [
"filecheck", "filecheck",
"gimli", "gimli",
"log", "log",
"memmap", "memmap2",
"num_cpus", "num_cpus",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
@@ -616,7 +616,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"log", "log",
"memmap", "memmap2",
"region", "region",
"target-lexicon", "target-lexicon",
"winapi", "winapi",
@@ -1533,21 +1533,11 @@ version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memmap"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "memmap2" name = "memmap2"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee" checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6"
dependencies = [ dependencies = [
"libc", "libc",
] ]

2
cranelift/filetests/Cargo.toml
View File

@@ -21,7 +21,7 @@ file-per-thread-logger = "0.1.2"
filecheck = "0.5.0" filecheck = "0.5.0"
gimli = { version = "0.23.0", default-features = false, features = ["read"] } gimli = { version = "0.23.0", default-features = false, features = ["read"] }
log = "0.4.6" log = "0.4.6"
memmap = "0.7.0" memmap2 = "0.2.1"
num_cpus = "1.8.0" num_cpus = "1.8.0"
target-lexicon = "0.11" target-lexicon = "0.11"
thiserror = "1.0.15" thiserror = "1.0.15"

2
cranelift/filetests/src/function_runner.rs
View File

@@ -9,7 +9,7 @@ use cranelift_codegen::{ir, settings, CodegenError, Context};
use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext}; use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
use cranelift_native::builder as host_isa_builder; use cranelift_native::builder as host_isa_builder;
use log::trace; use log::trace;
use memmap::{Mmap, MmapMut}; use memmap2::{Mmap, MmapMut};
use std::cmp::max; use std::cmp::max;
use std::collections::HashMap; use std::collections::HashMap;
use thiserror::Error; use thiserror::Error;

4
cranelift/jit/Cargo.toml
View File

@@ -19,14 +19,14 @@ region = "2.2.0"
libc = { version = "0.2.42" } libc = { version = "0.2.42" }
errno = "0.2.4" errno = "0.2.4"
target-lexicon = "0.11" target-lexicon = "0.11"
memmap = { version = "0.7.0", optional = true } memmap2 = { version = "0.2.1", optional = true }
log = { version = "0.4.6", default-features = false } log = { version = "0.4.6", default-features = false }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["winbase", "memoryapi"] } winapi = { version = "0.3", features = ["winbase", "memoryapi"] }
[features] [features]
selinux-fix = ['memmap'] selinux-fix = ['memmap2']
default = [] default = []
[dev-dependencies] [dev-dependencies]

2
cranelift/jit/src/memory.rs
View File

@@ -5,7 +5,7 @@ use errno;
use libc; use libc;
#[cfg(feature = "selinux-fix")] #[cfg(feature = "selinux-fix")]
use memmap::MmapMut; use memmap2::MmapMut;
use region; use region;
use std::convert::TryFrom; use std::convert::TryFrom;