gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-09-05 17:32:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix potential integer overflow issues (#4429)

Browse Source 
It is reported as "Multiplication result converted to larger type".
And "Multiplication result may overflow 'Type A' before it is
converted to 'Type B'." Type A is a larger type than Type B.

Since the conversion applies after the multiplication, arithmetic
overflow may still occur.

> The rule flags every multiplication of two non-constant integer expressions
> that is (explicitly or implicitly) converted to a larger integer type. The
> conversion is an indication that the expression would produce a result that
> would be too large to fit in the smaller integer type.
This commit is contained in:
liang.he 2025-07-01 13:39:30 +08:00 committed by GitHub
parent 8949797c84
commit c7148a6823
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/iwasm/aot/aot_runtime.c
View File

@ -3639,7 +3639,7 @@ aot_get_module_inst_mem_consumption(const AOTModuleInstance *module_inst,
for (i = 0; i < module_inst->memory_count; i++) { for (i = 0; i < module_inst->memory_count; i++) {
AOTMemoryInstance *mem_inst = module_inst->memories[i]; AOTMemoryInstance *mem_inst = module_inst->memories[i];
mem_conspn->memories_size += mem_conspn->memories_size +=
mem_inst->num_bytes_per_page * mem_inst->cur_page_count; (uint64)mem_inst->num_bytes_per_page * mem_inst->cur_page_count;
mem_conspn->app_heap_size = mem_conspn->app_heap_size =
mem_inst->heap_data_end - mem_inst->heap_data; mem_inst->heap_data_end - mem_inst->heap_data;
/* size of app heap structure */ /* size of app heap structure */

4
core/iwasm/compilation/aot_emit_aot_file.c
View File

@ -302,8 +302,8 @@ get_init_expr_size(const AOTCompContext *comp_ctx, const AOTCompData *comp_data,
/* array_elem_type + type_index + len + elems */ /* array_elem_type + type_index + len + elems */
size += sizeof(uint32) * 3 size += sizeof(uint32) * 3
+ wasm_value_type_size_internal(array_type->elem_type, + (uint64)wasm_value_type_size_internal(
comp_ctx->pointer_size) array_type->elem_type, comp_ctx->pointer_size)
* value_count; * value_count;
break; break;
} }

3
core/iwasm/compilation/aot_emit_function.c
View File

@ -347,7 +347,8 @@ call_aot_invoke_c_api_native(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
/* Get &c_api_func_imports[func_idx], note size of CApiFuncImport /* Get &c_api_func_imports[func_idx], note size of CApiFuncImport
is pointer_size * 3 */ is pointer_size * 3 */
offset = I32_CONST((comp_ctx->pointer_size * 3) * import_func_idx); offset = I32_CONST((unsigned long long)comp_ctx->pointer_size * 3
* import_func_idx);
CHECK_LLVM_CONST(offset); CHECK_LLVM_CONST(offset);
c_api_func_import = c_api_func_import =
LLVMBuildInBoundsGEP2(comp_ctx->builder, INT8_TYPE, c_api_func_imports, LLVMBuildInBoundsGEP2(comp_ctx->builder, INT8_TYPE, c_api_func_imports,

2
core/iwasm/interpreter/wasm_runtime.c
View File

@ -4161,7 +4161,7 @@ wasm_get_module_inst_mem_consumption(const WASMModuleInstance *module_inst,
sizeof(WASMMemoryInstance *) * module_inst->memory_count; sizeof(WASMMemoryInstance *) * module_inst->memory_count;
for (i = 0; i < module_inst->memory_count; i++) { for (i = 0; i < module_inst->memory_count; i++) {
WASMMemoryInstance *memory = module_inst->memories[i]; WASMMemoryInstance *memory = module_inst->memories[i];
size = memory->num_bytes_per_page * memory->cur_page_count; size = (uint64)memory->num_bytes_per_page * memory->cur_page_count;
mem_conspn->memories_size += size; mem_conspn->memories_size += size;
mem_conspn->app_heap_size += memory->heap_data_end - memory->heap_data; mem_conspn->app_heap_size += memory->heap_data_end - memory->heap_data;
/* size of app heap structure */ /* size of app heap structure */

3
core/iwasm/libraries/thread-mgr/thread_manager.c
View File

@ -301,7 +301,8 @@ wasm_cluster_create(WASMExecEnv *exec_env)
aux_stack_start -= cluster->stack_size; aux_stack_start -= cluster->stack_size;
for (i = 0; i < cluster_max_thread_num; i++) { for (i = 0; i < cluster_max_thread_num; i++) {
cluster->stack_tops[i] = aux_stack_start - cluster->stack_size * i; cluster->stack_tops[i] =
aux_stack_start - (uint64)cluster->stack_size * i;
} }
} }
#endif #endif