memset string pages to zero to avoid putting random data on the stack

that may make some program crash at startup.
Fix unsigned long / target_ulong confusion (more to do).
Fix missing g2h macros.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3249 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-09-27 04:10:43 +00:00
parent 526216880d
commit 4118a97030
2 changed files with 5 additions and 4 deletions

View File

@ -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;

View File

@ -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;
}