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

Zero the memory mapped from os_mmap in NuttX (#3132)

Browse Source 
Zero the memory which is required by os_mmap.

This fixes the nuttx spec test CI failure:
https://github.com/bytecodealliance/wasm-micro-runtime/actions/runs/7777804669
This commit is contained in:
Huang Qi 2024-02-05 15:45:22 +08:00 committed by GitHub
parent 06df58f20e
commit 1a676f212b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/shared/platform/nuttx/nuttx_platform.c
View File

@ -94,7 +94,11 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
#if defined(CONFIG_ARCH_USE_TEXT_HEAP) #if defined(CONFIG_ARCH_USE_TEXT_HEAP)
if ((prot & MMAP_PROT_EXEC) != 0) { if ((prot & MMAP_PROT_EXEC) != 0) {
return up_textheap_memalign(sizeof(void *), size); p = up_textheap_memalign(sizeof(void *), size);
if (p) {
memset(p, 0, size);
}
return p;
} }
#endif #endif
@ -108,7 +112,11 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
return NULL; return NULL;
} }
i_addr = (void *)((uint8 *)d_addr + MEM_DUAL_BUS_OFFSET); i_addr = (void *)((uint8 *)d_addr + MEM_DUAL_BUS_OFFSET);
return in_ibus_ext(i_addr) ? i_addr : d_addr; p = in_ibus_ext(i_addr) ? i_addr : d_addr;
if (p) {
memset(p, 0, size);
}
return p;
} }
#endif #endif
/* Note: aot_loader.c assumes that os_mmap provides large enough /* Note: aot_loader.c assumes that os_mmap provides large enough
@ -125,6 +133,10 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
if (posix_memalign(&p, 32, size)) { if (posix_memalign(&p, 32, size)) {
return NULL; return NULL;
} }
/* Zero the memory which is required by os_mmap */
memset(p, 0, size);
return p; return p;
} }