Skip to content

Fix issue of condition settings of app boundary check (#249) #104

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
May 8, 2020
Merged

Fix issue of condition settings of app boundary check (#249) #104

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
24 changes: 11 additions & 13 deletions core/iwasm/aot/aot_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,11 +635,10 @@ aot_validate_app_addr(AOTModuleInstance *module_inst,
goto fail;
}

if (app_offset <= module_inst->heap_base_offset
|| app_offset + (int32)size > (int32)module_inst->memory_data_size) {
goto fail;
if (module_inst->heap_base_offset <= app_offset
&& app_offset + (int32)size <= (int32)module_inst->memory_data_size) {
return true;
}
return true;
fail:
aot_set_exception(module_inst, "out of bounds memory access");
return false;
Expand All @@ -657,12 +656,11 @@ aot_validate_native_addr(AOTModuleInstance *module_inst,
goto fail;
}

if (addr <= (uint8*)module_inst->heap_data.ptr
|| addr + size > (uint8*)module_inst->memory_data.ptr
+ memory_data_size) {
goto fail;
if ((uint8*)module_inst->heap_data.ptr <= addr
&& addr + size <= (uint8*)module_inst->memory_data.ptr
+ memory_data_size) {
return true;
}
return true;
fail:
aot_set_exception(module_inst, "out of bounds memory access");
return false;
Expand All @@ -674,7 +672,7 @@ aot_addr_app_to_native(AOTModuleInstance *module_inst, int32 app_offset)
int32 memory_data_size = (int32)module_inst->memory_data_size;
uint8 *addr = (uint8 *)module_inst->memory_data.ptr + app_offset;

if ((uint8*)module_inst->heap_data.ptr < addr
if ((uint8*)module_inst->heap_data.ptr <= addr
&& addr < (uint8*)module_inst->memory_data.ptr
+ memory_data_size)
return addr;
Expand All @@ -687,7 +685,7 @@ aot_addr_native_to_app(AOTModuleInstance *module_inst, void *native_ptr)
uint8 *addr = (uint8*)native_ptr;
int32 memory_data_size = (int32)module_inst->memory_data_size;

if ((uint8*)module_inst->heap_data.ptr < addr
if ((uint8*)module_inst->heap_data.ptr <= addr
&& addr < (uint8*)module_inst->memory_data.ptr
+ memory_data_size)
return (int32)(addr - (uint8*)module_inst->memory_data.ptr);
Expand All @@ -702,7 +700,7 @@ aot_get_app_addr_range(AOTModuleInstance *module_inst,
{
int32 memory_data_size = (int32)module_inst->memory_data_size;

if (module_inst->heap_base_offset < app_offset
if (module_inst->heap_base_offset <= app_offset
&& app_offset < memory_data_size) {
if (p_app_start_offset)
*p_app_start_offset = module_inst->heap_base_offset;
Expand All @@ -722,7 +720,7 @@ aot_get_native_addr_range(AOTModuleInstance *module_inst,
uint8 *addr = (uint8*)native_ptr;
int32 memory_data_size = (int32)module_inst->memory_data_size;

if ((uint8*)module_inst->heap_data.ptr < addr
if ((uint8*)module_inst->heap_data.ptr <= addr
&& addr < (uint8*)module_inst->memory_data.ptr
+ memory_data_size) {
if (p_native_start_addr)
Expand Down
22 changes: 10 additions & 12 deletions core/iwasm/interpreter/wasm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,11 +952,10 @@ wasm_validate_app_addr(WASMModuleInstance *module_inst,
goto fail;
}

if (app_offset <= memory->heap_base_offset
|| app_offset + (int32)size > memory_data_size) {
goto fail;
if (memory->heap_base_offset <= app_offset
&& app_offset + (int32)size <= memory_data_size) {
return true;
}
return true;
fail:
wasm_set_exception(module_inst, "out of bounds memory access");
return false;
Expand All @@ -975,11 +974,10 @@ wasm_validate_native_addr(WASMModuleInstance *module_inst,
goto fail;
}

if (addr <= memory->heap_data
|| addr + size > memory->memory_data + memory_data_size) {
goto fail;
if (memory->heap_data <= addr
&& addr + size <= memory->memory_data + memory_data_size) {
return true;
}
return true;
fail:
wasm_set_exception(module_inst, "out of bounds memory access");
return false;
Expand All @@ -994,7 +992,7 @@ wasm_addr_app_to_native(WASMModuleInstance *module_inst,
int32 memory_data_size =
(int32)(memory->num_bytes_per_page * memory->cur_page_count);

if (memory->heap_data < addr
if (memory->heap_data <= addr
&& addr < memory->memory_data + memory_data_size)
return addr;
return NULL;
Expand All @@ -1009,7 +1007,7 @@ wasm_addr_native_to_app(WASMModuleInstance *module_inst,
int32 memory_data_size =
(int32)(memory->num_bytes_per_page * memory->cur_page_count);

if (memory->heap_data < addr
if (memory->heap_data <= addr
&& addr < memory->memory_data + memory_data_size)
return (int32)(addr - memory->memory_data);
return 0;
Expand All @@ -1025,7 +1023,7 @@ wasm_get_app_addr_range(WASMModuleInstance *module_inst,
int32 memory_data_size =
(int32)(memory->num_bytes_per_page * memory->cur_page_count);

if (memory->heap_base_offset < app_offset
if (memory->heap_base_offset <= app_offset
&& app_offset < memory_data_size) {
if (p_app_start_offset)
*p_app_start_offset = memory->heap_base_offset;
Expand All @@ -1047,7 +1045,7 @@ wasm_get_native_addr_range(WASMModuleInstance *module_inst,
int32 memory_data_size =
(int32)(memory->num_bytes_per_page * memory->cur_page_count);

if (memory->heap_data < addr
if (memory->heap_data <= addr
&& addr < memory->memory_data + memory_data_size) {
if (p_native_start_addr)
*p_native_start_addr = memory->heap_data;
Expand Down