Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/wasix/wasix1/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,10 @@ impl<'a, S: 'static> CompatMemory<'a, S> {

/// The window offsets `addr..addr + len`, or `None` if `addr` is below the window. Only
/// what this call allocated is there: a range that starts past it faults, as an address
/// the guest's memory does not reach would. A read that starts inside an allocation and
/// runs past its end reads zeroes there, since the kernel reads strings in aligned chunks.
/// the guest's memory does not reach would. An empty range anywhere in the window is valid,
/// and an empty read copies nothing, as Linux's zero-length user copies never fault. A read
/// that starts inside an allocation and runs past its end reads zeroes there, since the
/// kernel reads strings in aligned chunks.
fn scratch_range(addr: u32, len: usize, held: usize) -> Option<Result<(usize, usize), Fault>> {
if addr < SCRATCH_BASE {
return None;
Expand All @@ -161,6 +163,7 @@ impl<S: 'static> UserMemory for CompatMemory<'_, S> {
fn read<'a>(&'a self, addr: u32, buf: &'a mut [u8]) -> LocalFuture<'a, Result<(), Fault>> {
let held = self.scratch.borrow().len();
match Self::scratch_range(addr, buf.len(), held) {
Some(Ok(_)) if buf.is_empty() => copied(Ok(())),
Some(range) => {
let result = range.map(|(start, end)| {
let scratch = self.scratch.borrow();
Expand Down
34 changes: 34 additions & 0 deletions lib/wasix/wasix1/tests/guest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,40 @@ fn hello_world() {
assert_eq!(status, 7);
}

/// Empty buffers are never read, even where they point into the compat layer's scratch window:
/// Linux's `writev(fd, iov, 0)` returns 0 without looking at `iov`, and an empty iovec's base is
/// never touched. Both used to panic the host.
#[test]
fn empty_iovec_array_in_scratch_window() {
let wat = r#"
(module
(import "wasi_snapshot_preview1" "fd_write" (func $fd_write (param i32 i32 i32 i32) (result i32)))
(import "wasi_snapshot_preview1" "fd_read" (func $fd_read (param i32 i32 i32 i32) (result i32)))
(import "wasi_snapshot_preview1" "proc_exit" (func $proc_exit (param i32)))
(memory (export "memory") 1)
;; One empty iovec whose buffer lies in the window.
(data (i32.const 8) "\00\00\80\ff\00\00\00\00")
(func (export "_start")
(i32.store (i32.const 32) (i32.const -1))
(if (call $fd_read (i32.const 0) (i32.const 8) (i32.const 1) (i32.const 32))
(then (call $proc_exit (i32.const 5))))
(if (i32.load (i32.const 32))
(then (call $proc_exit (i32.const 6))))
(i32.store (i32.const 32) (i32.const -1))
(if (call $fd_write (i32.const 1) (i32.const 0xff800000) (i32.const 0) (i32.const 32))
(then (call $proc_exit (i32.const 1))))
(if (i32.load (i32.const 32))
(then (call $proc_exit (i32.const 2))))
(i32.store (i32.const 32) (i32.const -1))
(if (call $fd_read (i32.const 0) (i32.const 0xff800000) (i32.const 0) (i32.const 32))
(then (call $proc_exit (i32.const 3))))
(if (i32.load (i32.const 32))
(then (call $proc_exit (i32.const 4))))
(call $proc_exit (i32.const 0))))
"#;
assert_eq!(block_on(wat, &["empty-iovecs"]).0, 0);
}

/// Returning from `_start` is `exit(0)` under WASI.
#[test]
fn returning_from_start_exits_zero() {
Expand Down
Loading