diff options
| -rw-r--r-- | linux-user/elfload.c | 3 | ||||
| -rw-r--r-- | linux-user/mmap.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 2a43338..22e3283 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -517,7 +517,7 @@ static void bswap_sym(struct elf_sym *sym) * */ static unsigned long copy_elf_strings(int argc,char ** argv, void **page, - unsigned long p) + target_ulong p) { char *tmp, *tmp1, *pag = NULL; int len, offset = 0; @@ -544,6 +544,7 @@ static unsigned long copy_elf_strings(int argc,char ** argv, void **page, pag = (char *)page[p/TARGET_PAGE_SIZE]; if (!pag) { pag = (char *)malloc(TARGET_PAGE_SIZE); + memset(pag, 0, TARGET_PAGE_SIZE); page[p/TARGET_PAGE_SIZE] = pag; if (!pag) return 0; diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 28954f1..29f1d96 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -224,9 +224,9 @@ abort(); start = HOST_PAGE_ALIGN(real_start); end = start + HOST_PAGE_ALIGN(len); if (start > real_start) - munmap((void *)real_start, start - real_start); + munmap((void *)g2h(real_start), start - real_start); if (end < real_end) - munmap((void *)end, real_end - end); + munmap((void *)g2h(end), real_end - end); /* use it as a fixed mapping */ flags |= MAP_FIXED; } else { @@ -370,7 +370,7 @@ int target_munmap(target_ulong start, target_ulong len) /* unmap what we can */ if (real_start < real_end) { - ret = munmap((void *)real_start, real_end - real_start); + ret = munmap(g2h(real_start), real_end - real_start); if (ret != 0) return ret; } |