From patchwork Wed Nov 9 19:22:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 124664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A868BB6F8E for ; Thu, 10 Nov 2011 06:22:24 +1100 (EST) Received: from localhost ([::1]:47957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RODj2-000260-0T for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2011 14:22:20 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RODix-00025v-Ay for qemu-devel@nongnu.org; Wed, 09 Nov 2011 14:22:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RODiw-0004rO-6g for qemu-devel@nongnu.org; Wed, 09 Nov 2011 14:22:15 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:51573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RODiv-0004rG-Uy for qemu-devel@nongnu.org; Wed, 09 Nov 2011 14:22:14 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RODit-0002aI-8H; Wed, 09 Nov 2011 19:22:11 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 9 Nov 2011 19:22:11 +0000 Message-Id: <1320866531-9911-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Riku Voipio , patches@linaro.org Subject: [Qemu-devel] [PATCH] linux-user/elfload.c: Don't memset(NULL..) if malloc() failed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If a malloc() in copy_elf_strings() failed we would call memset() before the "did malloc fail?" check. Fix this by moving to the glib alloc/free routines for this memory so we can use g_try_malloc0 rather than having a separate memset(). Spotted by Coverity (see bug 887883). Signed-off-by: Peter Maydell --- We could obviously also fix this by just moving the memset after the null check, but I think we want to move towards consistently using the glib memory routines everywhere anyway. linux-user/elfload.c | 5 ++--- linux-user/linuxload.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a413976..4635bb2 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1105,8 +1105,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; @@ -1164,7 +1163,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; } diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 62ebc7e..b47025f 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -178,7 +178,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp, /* Something went wrong, return the inode and free the argument pages*/ for (i=0 ; ipage[i]); + g_free(bprm->page[i]); } return(retval); }