From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=38647 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OeW6e-0005G1-Rk for qemu-devel@nongnu.org; Thu, 29 Jul 2010 12:37:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OeW6d-0003Ee-FM for qemu-devel@nongnu.org; Thu, 29 Jul 2010 12:37:16 -0400 Received: from b.mail.sonic.net ([64.142.19.5]:48204) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OeW6d-0003EX-8E for qemu-devel@nongnu.org; Thu, 29 Jul 2010 12:37:15 -0400 From: Richard Henderson Date: Thu, 29 Jul 2010 09:37:01 -0700 Message-Id: <1280421421-22883-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH] linux-user: Protect against allocation failure in load_symbols. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: edgar.iglesias@gmail.com Cc: malc Signed-off-by: Richard Henderson --- linux-user/elfload.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a53285a..33d776d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1546,7 +1546,17 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) } } + /* Attempt to free the storage associated with the local symbols + that we threw away. Whether or not this has any effect on the + memory allocation depends on the malloc implementation and how + many symbols we managed to discard. */ syms = realloc(syms, nsyms * sizeof(*syms)); + if (syms == NULL) { + free(s); + free(strings); + return; + } + qsort(syms, nsyms, sizeof(*syms), symcmp); s->disas_num_syms = nsyms; -- 1.7.2