gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-06 15:05:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Add more checks in wasm loader (#3300)

Browse Source 
In opcode f32.const, f64.const and memory.copy, check whether the buffer
to read is out of the range of wasm file before reading it.
This commit is contained in:
Wenyong Huang 2024-04-11 19:56:48 +08:00 committed by GitHub
parent 19a6eb98b0
commit 1c690b7561
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/interpreter/wasm_loader.c
View File

@ -13008,6 +13008,7 @@ re_scan:
break; break;
case WASM_OP_F32_CONST: case WASM_OP_F32_CONST:
CHECK_BUF(p, p_end, sizeof(float32));
p += sizeof(float32); p += sizeof(float32);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
@ -13026,6 +13027,7 @@ re_scan:
break; break;
case WASM_OP_F64_CONST: case WASM_OP_F64_CONST:
CHECK_BUF(p, p_end, sizeof(float64));
p += sizeof(float64); p += sizeof(float64);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
@ -14356,6 +14358,7 @@ re_scan:
} }
case WASM_OP_MEMORY_COPY: case WASM_OP_MEMORY_COPY:
{ {
CHECK_BUF(p, p_end, sizeof(int16));
/* both src and dst memory index should be 0 */ /* both src and dst memory index should be 0 */
if (*(int16 *)p != 0x0000) if (*(int16 *)p != 0x0000)
goto fail_zero_byte_expected; goto fail_zero_byte_expected;

3
core/iwasm/interpreter/wasm_mini_loader.c
View File

@ -7351,6 +7351,7 @@ re_scan:
break; break;
case WASM_OP_F32_CONST: case WASM_OP_F32_CONST:
CHECK_BUF(p, p_end, sizeof(float32));
p += sizeof(float32); p += sizeof(float32);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
@ -7369,6 +7370,7 @@ re_scan:
break; break;
case WASM_OP_F64_CONST: case WASM_OP_F64_CONST:
CHECK_BUF(p, p_end, sizeof(float64));
p += sizeof(float64); p += sizeof(float64);
#if WASM_ENABLE_FAST_INTERP != 0 #if WASM_ENABLE_FAST_INTERP != 0
skip_label(); skip_label();
@ -7676,6 +7678,7 @@ re_scan:
} }
case WASM_OP_MEMORY_COPY: case WASM_OP_MEMORY_COPY:
{ {
CHECK_BUF(p, p_end, sizeof(int16));
/* both src and dst memory index should be 0 */ /* both src and dst memory index should be 0 */
bh_assert(*(int16 *)p == 0x0000); bh_assert(*(int16 *)p == 0x0000);
p += 2; p += 2;