A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Fix a multiplication overflow on 32-bit platforms (#13653)
Alex Crichton7071f917cb13
diff --git a/crates/wasmtime/src/runtime/component/concurrent/futures_and_streams.rs b/crates/wasmtime/src/runtime/component/concurrent/futures_and_streams.rsindex c009f03a89..92fa9882a7 100644--- a/crates/wasmtime/src/runtime/component/concurrent/futures_and_streams.rs+++ b/crates/wasmtime/src/runtime/component/concurrent/futures_and_streams.rs@@ -3502,7 +3502,7 @@ impl Instance {if count > 0 && size > 0 {self.options_memory(store, options).get(address..)- .and_then(|b| b.get(..(size * count)))+ .and_then(|b| b.get(..size.checked_mul(count)?)).map(drop).ok_or_else(|| crate::format_err!("read pointer out of bounds of memory"))} else {diff --git a/tests/misc_testsuite/component-model/async/stream-big-read-and-writes.wast b/tests/misc_testsuite/component-model/async/stream-big-read-and-writes.wastindex feaf32220e..fb0493602c 100644--- a/tests/misc_testsuite/component-model/async/stream-big-read-and-writes.wast+++ b/tests/misc_testsuite/component-model/async/stream-big-read-and-writes.wast@@ -41,3 +41,47 @@)(assert_return (invoke "run" (u32.const 0x0fffffff)) (u32.const 42))(assert_trap (invoke "run" (u32.const 0x10000000)) "stream read/write count too large")++;; Perform a write that overflows the 32-bit index space and ensure that a trap+;; of some kind is generated.+(component+ (type $elem (tuple u64 u64 u8)) ;; 24-byte structure+ (type $s (stream $elem))++ (core module $libc (memory (export "memory") 1))+ (core instance $libc (instantiate $libc))++ (core module $m+ (import "libc" "memory" (memory 1))+ (import "" "stream.new" (func $stream.new (result i64)))+ (import "" "stream.write" (func $stream.write (param i32 i32 i32) (result i32)))++ (func (export "run") (result i32)+ (local $s i64)+ (local $w i32)+ (local.set $s (call $stream.new))+ (local.set $w (i32.wrap_i64 (i64.shr_u (local.get $s) (i64.const 32))))+ (call $stream.write+ (local.get $w)+ (i32.const 0)+ (i32.const 200000000)) ;; count: < 2^28, but 24*count > 2^32+ unreachable)++ (func (export "cb") (param i32 i32 i32) (result i32) unreachable)+ )++ (core func $stream.new (canon stream.new $s))+ (core func $stream.write (canon stream.write $s async (memory $libc "memory")))++ (core instance $m (instantiate $m+ (with "libc" (instance $libc))+ (with "" (instance+ (export "stream.new" (func $stream.new))+ (export "stream.write" (func $stream.write))+ ))+ ))++ (func (export "run") async+ (canon lift (core func $m "run") async (callback (func $m "cb"))))+)+(assert_trap (invoke "run") "out of bounds")