christoph/wamr
1
Fork 0
Code Releases Activity

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

Browse Source 
The os_mmap should zero the mapped memory like what posix mmap does.
This commit is contained in:
Wenyong Huang
2024-06-21 13:33:12 +08:00
committed by GitHub
parent e8df3b5c48
commit 607ae47d7b
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/shared/platform/alios/alios_platform.c
View File

@ -49,9 +49,15 @@ os_dumps_proc_mem_info(char *out, unsigned int size)
void * void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file) 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 NULL;
return BH_MALLOC((uint32)size);
if ((addr = BH_MALLOC((uint32)size)))
memset(addr, 0, (uint32)size);
return addr;
} }
void void

3
core/shared/platform/esp-idf/espidf_memmap.c
View File

@ -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); uintptr_t *addr_field = buf_fixed - sizeof(uintptr_t);
*addr_field = (uintptr_t)buf_origin; *addr_field = (uintptr_t)buf_origin;
#if (WASM_MEM_DUAL_BUS_MIRROR != 0) #if (WASM_MEM_DUAL_BUS_MIRROR != 0)
memset(buf_fixed + MEM_DUAL_BUS_OFFSET, 0, size);
return buf_fixed + MEM_DUAL_BUS_OFFSET; return buf_fixed + MEM_DUAL_BUS_OFFSET;
#else #else
memset(buf_fixed, 0, size);
return buf_fixed; return buf_fixed;
#endif #endif
} }
@ -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); uintptr_t *addr_field = buf_fixed - sizeof(uintptr_t);
*addr_field = (uintptr_t)buf_origin; *addr_field = (uintptr_t)buf_origin;
memset(buf_fixed, 0, size);
return buf_fixed; return buf_fixed;
} }
} }

12
core/shared/platform/riot/riot_platform.c
View File

@ -52,9 +52,15 @@ os_dumps_proc_mem_info(char *out, unsigned int size)
void * void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file) 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 NULL;
return BH_MALLOC((unsigned)size);
if ((addr = BH_MALLOC((uint32)size)))
memset(addr, 0, (uint32)size);
return addr;
} }
void * void *
@ -88,4 +94,4 @@ os_dcache_flush(void)
void void
os_icache_flush(void *start, size_t len) os_icache_flush(void *start, size_t len)
{} {}

9
core/shared/platform/rt-thread/rtt_platform.c
View File

@ -200,7 +200,12 @@ os_cond_wait(korp_cond *cond, korp_mutex *mutex)
void * void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file) 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 void
@ -221,4 +226,4 @@ os_dcache_flush(void)
void void
os_icache_flush(void *start, size_t len) os_icache_flush(void *start, size_t len)
{} {}

11
core/shared/platform/zephyr/zephyr_platform.c
View File

@ -179,12 +179,19 @@ strcspn(const char *s, const char *reject)
void * void *
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file) os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
{ {
void *addr;
if ((uint64)size >= UINT32_MAX) if ((uint64)size >= UINT32_MAX)
return NULL; return NULL;
if (exec_mem_alloc_func) if (exec_mem_alloc_func)
return exec_mem_alloc_func((uint32)size); addr = exec_mem_alloc_func((uint32)size);
else else
return BH_MALLOC(size); addr = BH_MALLOC(size);
if (addr)
memset(addr, 0, size);
return addr;
} }
void * void *