Skip to content

Add more checks in wasm loader #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Add more checks in wasm loader #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions core/iwasm/interpreter/wasm_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13008,6 +13008,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
break;

case WASM_OP_F32_CONST:
CHECK_BUF(p, p_end, sizeof(float32));
p += sizeof(float32);
#if WASM_ENABLE_FAST_INTERP != 0
skip_label();
Expand All @@ -13026,6 +13027,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
break;

case WASM_OP_F64_CONST:
CHECK_BUF(p, p_end, sizeof(float64));
p += sizeof(float64);
#if WASM_ENABLE_FAST_INTERP != 0
skip_label();
Expand Down Expand Up @@ -14356,6 +14358,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
}
case WASM_OP_MEMORY_COPY:
{
CHECK_BUF(p, p_end, sizeof(int16));
/* both src and dst memory index should be 0 */
if (*(int16 *)p != 0x0000)
goto fail_zero_byte_expected;
Expand Down
3 changes: 3 additions & 0 deletions core/iwasm/interpreter/wasm_mini_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7351,6 +7351,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
break;

case WASM_OP_F32_CONST:
CHECK_BUF(p, p_end, sizeof(float32));
p += sizeof(float32);
#if WASM_ENABLE_FAST_INTERP != 0
skip_label();
Expand All @@ -7369,6 +7370,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
break;

case WASM_OP_F64_CONST:
CHECK_BUF(p, p_end, sizeof(float64));
p += sizeof(float64);
#if WASM_ENABLE_FAST_INTERP != 0
skip_label();
Expand Down Expand Up @@ -7676,6 +7678,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
}
case WASM_OP_MEMORY_COPY:
{
CHECK_BUF(p, p_end, sizeof(int16));
/* both src and dst memory index should be 0 */
bh_assert(*(int16 *)p == 0x0000);
p += 2;
Expand Down