Skip to content

core/shared/platform: Zero memory returned by os_mmap in some platforms #3551

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
Jun 21, 2024
Merged

core/shared/platform: Zero memory returned by os_mmap in some platforms #3551

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
10 changes: 8 additions & 2 deletions core/shared/platform/alios/alios_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,15 @@ os_dumps_proc_mem_info(char *out, unsigned int size)
void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
{
if ((uint64)size >= UINT32_MAX)
void *addr;

if (size >= UINT32_MAX)
return NULL;
return BH_MALLOC((uint32)size);

if ((addr = BH_MALLOC((uint32)size)))
memset(addr, 0, (uint32)size);

return addr;
}

void
Expand Down
3 changes: 3 additions & 0 deletions core/shared/platform/esp-idf/espidf_memmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
uintptr_t *addr_field = buf_fixed - sizeof(uintptr_t);
*addr_field = (uintptr_t)buf_origin;
#if (WASM_MEM_DUAL_BUS_MIRROR != 0)
memset(buf_fixed + MEM_DUAL_BUS_OFFSET, 0, size);
return buf_fixed + MEM_DUAL_BUS_OFFSET;
#else
memset(buf_fixed, 0, size);
return buf_fixed;
#endif
}
Expand All @@ -71,6 +73,7 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
uintptr_t *addr_field = buf_fixed - sizeof(uintptr_t);
*addr_field = (uintptr_t)buf_origin;

memset(buf_fixed, 0, size);
return buf_fixed;
}
}
Expand Down
12 changes: 9 additions & 3 deletions core/shared/platform/riot/riot_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,15 @@ os_dumps_proc_mem_info(char *out, unsigned int size)
void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
{
if (size > ((unsigned)~0))
void *addr;

if (size >= UINT32_MAX)
return NULL;
return BH_MALLOC((unsigned)size);

if ((addr = BH_MALLOC((uint32)size)))
memset(addr, 0, (uint32)size);

return addr;
}

void *
Expand Down Expand Up @@ -88,4 +94,4 @@ os_dcache_flush(void)

void
os_icache_flush(void *start, size_t len)
{}
{}
9 changes: 7 additions & 2 deletions core/shared/platform/rt-thread/rtt_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,12 @@ os_cond_wait(korp_cond *cond, korp_mutex *mutex)
void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
{
return rt_malloc(size);
void *addr;

if ((addr = rt_malloc(size)))
memset(addr, 0, size);

return addr;
}

void
Expand All @@ -221,4 +226,4 @@ os_dcache_flush(void)

void
os_icache_flush(void *start, size_t len)
{}
{}
11 changes: 9 additions & 2 deletions core/shared/platform/zephyr/zephyr_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,19 @@ strcspn(const char *s, const char *reject)
void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
{
void *addr;

if ((uint64)size >= UINT32_MAX)
return NULL;

if (exec_mem_alloc_func)
return exec_mem_alloc_func((uint32)size);
addr = exec_mem_alloc_func((uint32)size);
else
return BH_MALLOC(size);
addr = BH_MALLOC(size);

if (addr)
memset(addr, 0, size);
return addr;
}

void *
Expand Down