From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSZlL-0001cB-U9 for qemu-devel@nongnu.org; Mon, 21 Nov 2011 14:42:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSZlH-00049A-UU for qemu-devel@nongnu.org; Mon, 21 Nov 2011 14:42:43 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:55702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSZlH-00048t-Pm for qemu-devel@nongnu.org; Mon, 21 Nov 2011 14:42:39 -0500 From: Stefan Weil Date: Mon, 21 Nov 2011 20:41:58 +0100 Message-Id: <1321904518-30819-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] bsd_user: Fix potential null pointer dereference List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Stefan Weil This bug was spotted by cppcheck. Using g_try_malloc0 (as does the linux-user code) fixes this. Signed-off-by: Stefan Weil --- bsd-user/elfload.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 1ef1f97..1288884 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -641,8 +641,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, offset = p % TARGET_PAGE_SIZE; pag = (char *)page[p/TARGET_PAGE_SIZE]; if (!pag) { - pag = (char *)malloc(TARGET_PAGE_SIZE); - memset(pag, 0, TARGET_PAGE_SIZE); + pag = g_try_malloc0(TARGET_PAGE_SIZE); page[p/TARGET_PAGE_SIZE] = pag; if (!pag) return 0; @@ -696,7 +695,7 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, info->rss++; /* FIXME - check return value of memcpy_to_target() for failure */ 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; } -- 1.7.2.5