Skip to content

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

Fix off-by-one bounds check for atomic operations (#11977)

Alex Crichton1308d0accea3
diff --git a/crates/test-util/src/wast.rs b/crates/test-util/src/wast.rs
index 3988006256..5df2496a2f 100644
--- a/crates/test-util/src/wast.rs
+++ b/crates/test-util/src/wast.rs
@@ -411,6 +411,7 @@ impl WastTest {
"misc_testsuite/memory64/more-than-4gb.wast",
// shared memories + pooling allocator aren't supported yet
"misc_testsuite/memory-combos.wast",
+ "misc_testsuite/threads/atomics-end-of-memory.wast",
"misc_testsuite/threads/LB.wast",
"misc_testsuite/threads/LB_atomic.wast",
"misc_testsuite/threads/MP.wast",
diff --git a/crates/wasmtime/src/runtime/vm/memory.rs b/crates/wasmtime/src/runtime/vm/memory.rs
index 3336c86049..92db142c82 100644
--- a/crates/wasmtime/src/runtime/vm/memory.rs
+++ b/crates/wasmtime/src/runtime/vm/memory.rs
@@ -747,7 +747,7 @@ pub fn validate_atomic_addr(
}
let length = u64::try_from(def.current_length()).unwrap();
- if !(addr.saturating_add(access_size) < length) {
+ if !(addr.saturating_add(access_size) <= length) {
return Err(Trap::MemoryOutOfBounds);
}
diff --git a/tests/misc_testsuite/threads/atomics-end-of-memory.wast b/tests/misc_testsuite/threads/atomics-end-of-memory.wast
new file mode 100644
index 0000000000..d86de85ec1
--- /dev/null
+++ b/tests/misc_testsuite/threads/atomics-end-of-memory.wast
@@ -0,0 +1,18 @@
+;;! threads = true
+
+(module
+ (memory (export "mem") 1 1 shared)
+ (func (export "notify_last") (result i32)
+ (memory.atomic.notify (i32.const 65532) (i32.const 0))
+ )
+ (func (export "wait_last32") (result i32)
+ (memory.atomic.wait32 (i32.const 65532) (i32.const 0) (i64.const 0))
+ )
+ (func (export "wait_last64") (result i32)
+ (memory.atomic.wait64 (i32.const 65528) (i64.const 0) (i64.const 0))
+ )
+)
+
+(assert_return (invoke "notify_last") (i32.const 0))
+(assert_return (invoke "wait_last32") (i32.const 2))
+(assert_return (invoke "wait_last64") (i32.const 2))