diff options
author | Sam Clegg <sbc@chromium.org> | 2020-12-04 10:43:07 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-04 10:43:07 -0800 |
commit | 7f09ac527f59834fd5cca9311cb92ff28aad99d5 (patch) | |
tree | d16f5e3f3e66bdd7e17aeeebd7bc766ea64facdf | |
parent | bd9872ddf850bf177298a5274a15807e6227cd3d (diff) | |
download | binaryen-7f09ac527f59834fd5cca9311cb92ff28aad99d5.tar.gz binaryen-7f09ac527f59834fd5cca9311cb92ff28aad99d5.tar.bz2 binaryen-7f09ac527f59834fd5cca9311cb92ff28aad99d5.zip |
Don't apply SafeHeap to wasm start function (#3424)
In relocable code (MAIN/SIDE modules) we use the start function to run
`__wasm_init_memory` which loads the data segments into place. We
can't call get_sbkr pointer during that function because the sbrk
pointer itself lives in static data segment.
-rw-r--r-- | src/passes/SafeHeap.cpp | 10 | ||||
-rw-r--r-- | test/passes/safe-heap_start-function.passes | 1 | ||||
-rw-r--r-- | test/passes/safe-heap_start-function.txt | 1932 | ||||
-rw-r--r-- | test/passes/safe-heap_start-function.wast | 11 |
4 files changed, 1952 insertions, 2 deletions
diff --git a/src/passes/SafeHeap.cpp b/src/passes/SafeHeap.cpp index ccfbfbf14..a0006c973 100644 --- a/src/passes/SafeHeap.cpp +++ b/src/passes/SafeHeap.cpp @@ -67,6 +67,10 @@ struct AccessInstrumenter : public WalkerPass<PostWalker<AccessInstrumenter>> { // If the getSbrkPtr function is implemented in the wasm, we must not // instrument that, as it would lead to infinite recursion of it calling // SAFE_HEAP_LOAD that calls it and so forth. + // As well as the getSbrkPtr function we also avoid instrumenting the + // module start function. This is because this function is used in + // shared memory builds to load the passive memory segments, which in + // turn means that value of sbrk() is not available. Name getSbrkPtr; bool isFunctionParallel() override { return true; } @@ -78,7 +82,8 @@ struct AccessInstrumenter : public WalkerPass<PostWalker<AccessInstrumenter>> { AccessInstrumenter(Name getSbrkPtr) : getSbrkPtr(getSbrkPtr) {} void visitLoad(Load* curr) { - if (getFunction()->name == getSbrkPtr || curr->type == Type::unreachable) { + if (getFunction()->name == getModule()->start || + getFunction()->name == getSbrkPtr || curr->type == Type::unreachable) { return; } Builder builder(*getModule()); @@ -89,7 +94,8 @@ struct AccessInstrumenter : public WalkerPass<PostWalker<AccessInstrumenter>> { } void visitStore(Store* curr) { - if (getFunction()->name == getSbrkPtr || curr->type == Type::unreachable) { + if (getFunction()->name == getModule()->start || + getFunction()->name == getSbrkPtr || curr->type == Type::unreachable) { return; } Builder builder(*getModule()); diff --git a/test/passes/safe-heap_start-function.passes b/test/passes/safe-heap_start-function.passes new file mode 100644 index 000000000..1f835d6dd --- /dev/null +++ b/test/passes/safe-heap_start-function.passes @@ -0,0 +1 @@ +safe-heap diff --git a/test/passes/safe-heap_start-function.txt b/test/passes/safe-heap_start-function.txt new file mode 100644 index 000000000..6711c986c --- /dev/null +++ b/test/passes/safe-heap_start-function.txt @@ -0,0 +1,1932 @@ +(module + (type $i32_i32_=>_i64 (func (param i32 i32) (result i64))) + (type $i32_i32_i64_=>_none (func (param i32 i32 i64))) + (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $i32_i32_i32_=>_none (func (param i32 i32 i32))) + (type $none_=>_none (func)) + (type $i32_i32_f64_=>_none (func (param i32 i32 f64))) + (type $i32_i32_=>_f64 (func (param i32 i32) (result f64))) + (type $i32_i32_f32_=>_none (func (param i32 i32 f32))) + (type $i32_i32_=>_f32 (func (param i32 i32) (result f32))) + (type $none_=>_i32 (func (result i32))) + (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i32))) + (import "env" "segfault" (func $segfault)) + (import "env" "alignfault" (func $alignfault)) + (memory $0 1 1) + (start $foo) + (func $foo + (i32.store + (i32.load + (i32.const 1234) + ) + (i32.const 5678) + ) + ) + (func $bar + (call $SAFE_HEAP_STORE_i32_4_4 + (call $SAFE_HEAP_LOAD_i32_4_4 + (i32.const 1234) + (i32.const 0) + ) + (i32.const 0) + (i32.const 5678) + ) + ) + (func $SAFE_HEAP_LOAD_i32_1_1 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.load8_s + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_1_U_1 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.load8_u + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_2_1 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.load16_s align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_2_2 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i32.load16_s + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_2_U_1 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.load16_u align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_2_U_2 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i32.load16_u + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_4_1 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.load align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_4_2 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i32.load align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i32_4_4 (param $0 i32) (param $1 i32) (result i32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (i32.load + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_1_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load8_s + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_1_U_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load8_u + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_2_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load16_s align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_2_2 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.load16_s + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_2_U_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load16_u align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_2_U_2 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.load16_u + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load32_s align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_2 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.load32_s align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_4 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (i64.load32_s + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_U_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load32_u align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_U_2 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.load32_u align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_4_U_4 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (i64.load32_u + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_8_1 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.load align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_8_2 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.load align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_8_4 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (i64.load align=4 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_i64_8_8 (param $0 i32) (param $1 i32) (result i64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 7) + ) + (call $alignfault) + ) + (i64.load + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f32_4_1 (param $0 i32) (param $1 i32) (result f32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (f32.load align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f32_4_2 (param $0 i32) (param $1 i32) (result f32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (f32.load align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f32_4_4 (param $0 i32) (param $1 i32) (result f32) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (f32.load + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f64_8_1 (param $0 i32) (param $1 i32) (result f64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (f64.load align=1 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f64_8_2 (param $0 i32) (param $1 i32) (result f64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 1) + ) + (call $alignfault) + ) + (f64.load align=2 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f64_8_4 (param $0 i32) (param $1 i32) (result f64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 3) + ) + (call $alignfault) + ) + (f64.load align=4 + (local.get $2) + ) + ) + (func $SAFE_HEAP_LOAD_f64_8_8 (param $0 i32) (param $1 i32) (result f64) + (local $2 i32) + (local.set $2 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $2) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $2) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $2) + (i32.const 7) + ) + (call $alignfault) + ) + (f64.load + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_1_1 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.store8 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_2_1 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.store16 align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_2_2 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (i32.store16 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_4_1 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i32.store align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_4_2 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (i32.store align=2 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i32_4_4 (param $0 i32) (param $1 i32) (param $2 i32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 3) + ) + (call $alignfault) + ) + (i32.store + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_1_1 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 1) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.store8 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_2_1 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.store16 align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_2_2 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 2) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.store16 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_4_1 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.store32 align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_4_2 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.store32 align=2 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_4_4 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 3) + ) + (call $alignfault) + ) + (i64.store32 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_8_1 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (i64.store align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_8_2 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (i64.store align=2 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_8_4 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 3) + ) + (call $alignfault) + ) + (i64.store align=4 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_i64_8_8 (param $0 i32) (param $1 i32) (param $2 i64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 7) + ) + (call $alignfault) + ) + (i64.store + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f32_4_1 (param $0 i32) (param $1 i32) (param $2 f32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (f32.store align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f32_4_2 (param $0 i32) (param $1 i32) (param $2 f32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (f32.store align=2 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f32_4_4 (param $0 i32) (param $1 i32) (param $2 f32) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 4) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 3) + ) + (call $alignfault) + ) + (f32.store + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f64_8_1 (param $0 i32) (param $1 i32) (param $2 f64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (f64.store align=1 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f64_8_2 (param $0 i32) (param $1 i32) (param $2 f64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 1) + ) + (call $alignfault) + ) + (f64.store align=2 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f64_8_4 (param $0 i32) (param $1 i32) (param $2 f64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 3) + ) + (call $alignfault) + ) + (f64.store align=4 + (local.get $3) + (local.get $2) + ) + ) + (func $SAFE_HEAP_STORE_f64_8_8 (param $0 i32) (param $1 i32) (param $2 f64) + (local $3 i32) + (local.set $3 + (i32.add + (local.get $0) + (local.get $1) + ) + ) + (if + (i32.or + (i32.eq + (local.get $3) + (i32.const 0) + ) + (i32.gt_u + (i32.add + (local.get $3) + (i32.const 8) + ) + (i32.load + (call $emscripten_get_sbrk_ptr) + ) + ) + ) + (call $segfault) + ) + (if + (i32.and + (local.get $3) + (i32.const 7) + ) + (call $alignfault) + ) + (f64.store + (local.get $3) + (local.get $2) + ) + ) +) diff --git a/test/passes/safe-heap_start-function.wast b/test/passes/safe-heap_start-function.wast new file mode 100644 index 000000000..ddc947f7e --- /dev/null +++ b/test/passes/safe-heap_start-function.wast @@ -0,0 +1,11 @@ +(module + (memory 1 1) + (func $foo + ;; should not be modified because its the start function + (i32.store (i32.load (i32.const 1234)) (i32.const 5678)) + ) + (func $bar + (i32.store (i32.load (i32.const 1234)) (i32.const 5678)) + ) + (start $foo) +) |