提交 c580dee4 编写于 作者: S Stefan Weil 提交者: Blue Swirl

bsd_user: Fix potential null pointer dereference

This bug was spotted by cppcheck.

Using g_try_malloc0 (as does the linux-user code) fixes this.

v2:
Use g_free in bsdload.c, too. Thanks to Peter Maydell for this hint.
Signed-off-by: NStefan Weil <sw@weilnetz.de>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 217bfb44
...@@ -196,7 +196,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp, ...@@ -196,7 +196,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
/* Something went wrong, return the inode and free the argument pages*/ /* Something went wrong, return the inode and free the argument pages*/
for (i=0 ; i<MAX_ARG_PAGES ; i++) { for (i=0 ; i<MAX_ARG_PAGES ; i++) {
free(bprm.page[i]); g_free(bprm.page[i]);
} }
return(retval); return(retval);
} }
...@@ -641,8 +641,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, ...@@ -641,8 +641,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page,
offset = p % TARGET_PAGE_SIZE; offset = p % TARGET_PAGE_SIZE;
pag = (char *)page[p/TARGET_PAGE_SIZE]; pag = (char *)page[p/TARGET_PAGE_SIZE];
if (!pag) { if (!pag) {
pag = (char *)malloc(TARGET_PAGE_SIZE); pag = g_try_malloc0(TARGET_PAGE_SIZE);
memset(pag, 0, TARGET_PAGE_SIZE);
page[p/TARGET_PAGE_SIZE] = pag; page[p/TARGET_PAGE_SIZE] = pag;
if (!pag) if (!pag)
return 0; return 0;
...@@ -696,7 +695,7 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, ...@@ -696,7 +695,7 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm,
info->rss++; info->rss++;
/* FIXME - check return value of memcpy_to_target() for failure */ /* FIXME - check return value of memcpy_to_target() for failure */
memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE); memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE);
free(bprm->page[i]); g_free(bprm->page[i]);
} }
stack_base += TARGET_PAGE_SIZE; stack_base += TARGET_PAGE_SIZE;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册