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

Add import memory/table flag assert check for miniloader (#4179)

Browse Source
This commit is contained in:
TianlongLiang 2025-04-10 12:00:23 +08:00 committed by GitHub
parent 2a2632444b
commit 8fe98f64c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,7 +665,7 @@ load_table_import(const uint8 **p_buf, const uint8 *buf_end,
const char *table_name, WASMTableImport *table, const char *table_name, WASMTableImport *table,
char *error_buf, uint32 error_buf_size) char *error_buf, uint32 error_buf_size)
{ {
const uint8 *p = *p_buf, *p_end = buf_end; const uint8 *p = *p_buf, *p_end = buf_end, *p_org;
uint32 declare_elem_type = 0, table_flag = 0, declare_init_size = 0, uint32 declare_elem_type = 0, table_flag = 0, declare_init_size = 0,
declare_max_size = 0; declare_max_size = 0;
@ -678,7 +678,12 @@ load_table_import(const uint8 **p_buf, const uint8 *buf_end,
#endif #endif
); );
/* the table flag can't exceed one byte, only check in debug build given
* the nature of mini-loader */
p_org = p;
read_leb_uint32(p, p_end, table_flag); read_leb_uint32(p, p_end, table_flag);
bh_assert(p - p_org <= 1);
(void)p_org;
if (!wasm_table_check_flags(table_flag, error_buf, error_buf_size, false)) { if (!wasm_table_check_flags(table_flag, error_buf, error_buf_size, false)) {
return false; return false;
@ -711,7 +716,7 @@ load_memory_import(const uint8 **p_buf, const uint8 *buf_end,
const char *memory_name, WASMMemoryImport *memory, const char *memory_name, WASMMemoryImport *memory,
char *error_buf, uint32 error_buf_size) char *error_buf, uint32 error_buf_size)
{ {
const uint8 *p = *p_buf, *p_end = buf_end; const uint8 *p = *p_buf, *p_end = buf_end, *p_org;
#if WASM_ENABLE_APP_FRAMEWORK != 0 #if WASM_ENABLE_APP_FRAMEWORK != 0
uint32 pool_size = wasm_runtime_memory_pool_size(); uint32 pool_size = wasm_runtime_memory_pool_size();
uint32 max_page_count = pool_size * APP_MEMORY_MAX_GLOBAL_HEAP_PERCENT uint32 max_page_count = pool_size * APP_MEMORY_MAX_GLOBAL_HEAP_PERCENT
@ -724,7 +729,13 @@ load_memory_import(const uint8 **p_buf, const uint8 *buf_end,
uint32 declare_init_page_count = 0; uint32 declare_init_page_count = 0;
uint32 declare_max_page_count = 0; uint32 declare_max_page_count = 0;
/* the memory flag can't exceed one byte, only check in debug build given
* the nature of mini-loader */
p_org = p;
read_leb_uint32(p, p_end, mem_flag); read_leb_uint32(p, p_end, mem_flag);
bh_assert(p - p_org <= 1);
(void)p_org;
if (!wasm_memory_check_flags(mem_flag, error_buf, error_buf_size, false)) { if (!wasm_memory_check_flags(mem_flag, error_buf, error_buf_size, false)) {
return false; return false;
} }
@ -815,6 +826,8 @@ load_table(const uint8 **p_buf, const uint8 *buf_end, WASMTable *table,
#endif #endif
); );
/* the table flag can't exceed one byte, only check in debug build given
* the nature of mini-loader */
p_org = p; p_org = p;
read_leb_uint32(p, p_end, table->table_type.flags); read_leb_uint32(p, p_end, table->table_type.flags);
bh_assert(p - p_org <= 1); bh_assert(p - p_org <= 1);
@ -854,6 +867,8 @@ load_memory(const uint8 **p_buf, const uint8 *buf_end, WASMMemory *memory,
bool is_memory64 = false; bool is_memory64 = false;
#endif #endif
/* the memory flag can't exceed one byte, only check in debug build given
* the nature of mini-loader */
p_org = p; p_org = p;
read_leb_uint32(p, p_end, memory->flags); read_leb_uint32(p, p_end, memory->flags);
bh_assert(p - p_org <= 1); bh_assert(p - p_org <= 1);