Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Update rustls-webpki dependency (#13176)

Alex Crichtona0319c1f07d3
diff --git a/Cargo.lock b/Cargo.lock
index 41872111d2..45b6a2b6b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3305,9 +3305,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.103.12"
+version = "0.103.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
dependencies = [
"ring",
"rustls-pki-types",
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
index 92118fd4de..058e8ffccc 100644
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -19,7 +19,7 @@ cranelift-frontend = { workspace = true }
cranelift-interpreter = { workspace = true }
cranelift-native = { workspace = true }
cranelift-reader = { workspace = true }
-cranelift-jit = { workspace = true, features = ["wasmtime-unwinder"] }
+cranelift-jit = { workspace = true, features = ["selinux-fix", "wasmtime-unwinder"] }
cranelift-module = { workspace = true }
cranelift-control = { workspace = true }
wasmtime-unwinder = { workspace = true, features = ["cranelift"] }
diff --git a/cranelift/jit/Cargo.toml b/cranelift/jit/Cargo.toml
index b75c7c0134..c7a4d7f53f 100644
--- a/cranelift/jit/Cargo.toml
+++ b/cranelift/jit/Cargo.toml
@@ -24,7 +24,7 @@ anyhow = { workspace = true }
region = "3.0.2"
libc = { workspace = true }
target-lexicon = { workspace = true }
-memmap2 = "0.2.1"
+memmap2 = { version = "0.2.1", optional = true }
log = { workspace = true }
wasmtime-jit-icache-coherence = { workspace = true }
@@ -37,6 +37,7 @@ features = [
]
[features]
+selinux-fix = ['memmap2']
default = []
wasmtime-unwinder = ["dep:wasmtime-unwinder"]
diff --git a/cranelift/jit/src/memory/system.rs b/cranelift/jit/src/memory/system.rs
index e6c5a4d2c3..bd845aef4a 100644
--- a/cranelift/jit/src/memory/system.rs
+++ b/cranelift/jit/src/memory/system.rs
@@ -1,15 +1,21 @@
+use cranelift_module::{ModuleError, ModuleResult};
+
+#[cfg(all(not(target_os = "windows"), feature = "selinux-fix"))]
+use memmap2::MmapMut;
+
+#[cfg(not(any(feature = "selinux-fix", windows)))]
+use std::alloc;
use std::io;
use std::mem;
use std::ptr;
-use cranelift_module::{ModuleError, ModuleResult};
-use memmap2::MmapMut;
-
use super::{BranchProtection, JITMemoryKind, JITMemoryProvider};
/// A simple struct consisting of a pointer and length.
struct PtrLen {
+ #[cfg(all(not(target_os = "windows"), feature = "selinux-fix"))]
map: Option<MmapMut>,
+
ptr: *mut u8,
len: usize,
}
@@ -18,7 +24,9 @@ impl PtrLen {
/// Create a new empty `PtrLen`.
fn new() -> Self {
Self {
+ #[cfg(all(not(target_os = "windows"), feature = "selinux-fix"))]
map: None,
+
ptr: ptr::null_mut(),
len: 0,
}
@@ -26,6 +34,7 @@ impl PtrLen {
/// Create a new `PtrLen` pointing to at least `size` bytes of memory,
/// suitably sized and aligned for memory protection.
+ #[cfg(all(not(target_os = "windows"), feature = "selinux-fix"))]
fn with_size(size: usize) -> io::Result<Self> {
let alloc_size = region::page::ceil(size as *const ()) as usize;
MmapMut::map_anon(alloc_size).map(|mut mmap| {
@@ -38,8 +47,70 @@ impl PtrLen {
}
})
}
+
+ #[cfg(all(not(target_os = "windows"), not(feature = "selinux-fix")))]
+ fn with_size(size: usize) -> io::Result<Self> {
+ assert_ne!(size, 0);
+ let page_size = region::page::size();
+ let alloc_size = region::page::ceil(size as *const ()) as usize;
+ let layout = alloc::Layout::from_size_align(alloc_size, page_size).unwrap();
+ // Safety: We assert that the size is non-zero above.
+ let ptr = unsafe { alloc::alloc(layout) };
+
+ if !ptr.is_null() {
+ Ok(Self {
+ ptr,
+ len: alloc_size,
+ })
+ } else {
+ Err(io::Error::from(io::ErrorKind::OutOfMemory))
+ }
+ }
+
+ #[cfg(target_os = "windows")]
+ fn with_size(size: usize) -> io::Result<Self> {
+ use windows_sys::Win32::System::Memory::{
+ MEM_COMMIT, MEM_RESERVE, PAGE_READWRITE, VirtualAlloc,
+ };
+
+ // VirtualAlloc always rounds up to the next multiple of the page size
+ let ptr = unsafe {
+ VirtualAlloc(
+ ptr::null_mut(),
+ size,
+ MEM_COMMIT | MEM_RESERVE,
+ PAGE_READWRITE,
+ )
+ };
+ if !ptr.is_null() {
+ Ok(Self {
+ ptr: ptr as *mut u8,
+ len: region::page::ceil(size as *const ()) as usize,
+ })
+ } else {
+ Err(io::Error::last_os_error())
+ }
+ }
}
+// `MMapMut` from `cfg(feature = "selinux-fix")` already deallocates properly.
+#[cfg(all(not(target_os = "windows"), not(feature = "selinux-fix")))]
+impl Drop for PtrLen {
+ fn drop(&mut self) {
+ if !self.ptr.is_null() {
+ let page_size = region::page::size();
+ let layout = alloc::Layout::from_size_align(self.len, page_size).unwrap();
+ unsafe {
+ region::protect(self.ptr, self.len, region::Protection::READ_WRITE)
+ .expect("unable to unprotect memory");
+ alloc::dealloc(self.ptr, layout)
+ }
+ }
+ }
+}
+
+// TODO: add a `Drop` impl for `cfg(target_os = "windows")`
+
/// JIT memory manager. This manages pages of suitably aligned and
/// accessible memory. Memory will be leaked by default to have
/// function pointers remain valid for the remainder of the
@@ -130,9 +201,13 @@ impl Memory {
/// Iterates non protected memory allocations that are of not zero bytes in size.
fn non_protected_allocations_iter(&self) -> impl Iterator<Item = &PtrLen> {
- self.allocations[self.already_protected..]
- .iter()
- .filter(|&PtrLen { map, len, .. }| *len != 0 && map.is_some())
+ let iter = self.allocations[self.already_protected..].iter();
+
+ #[cfg(all(not(target_os = "windows"), feature = "selinux-fix"))]
+ return iter.filter(|&PtrLen { map, len, .. }| *len != 0 && map.is_some());
+
+ #[cfg(any(target_os = "windows", not(feature = "selinux-fix")))]
+ return iter.filter(|&PtrLen { len, .. }| *len != 0);
}
/// Frees all allocated memory regions that would be leaked otherwise.
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index fa6f139998..04085992fe 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -4523,6 +4523,12 @@ criteria = "safe-to-deploy"
delta = "0.103.10 -> 0.103.12"
notes = "Minor updates to address recent vulnerabilities, nothing awry."
+[[audits.rustls-webpki]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.103.12 -> 0.103.13"
+notes = "Minor fixes for the bug being fixed in this release, nothing awry."
+
[[audits.safetensors]]
who = "Andrew Brown <[email protected]>"
criteria = "safe-to-deploy"