From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSaha-0005OG-Fr for qemu-devel@nongnu.org; Tue, 25 Mar 2014 19:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSahV-0005IB-O5 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 19:24:14 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:58709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSahV-0005GL-I7 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 19:24:09 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so4043544wiv.13 for ; Tue, 25 Mar 2014 16:24:08 -0700 (PDT) Sender: James Hogan From: James Hogan Date: Tue, 25 Mar 2014 23:21:50 +0000 Message-Id: <1395789710-29191-1-git-send-email-james.hogan@imgtec.com> Subject: [Qemu-devel] [PATCH] linux-user: Assert stack used for auxvec, envp, argv List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Riku Voipio , James Hogan Assert that the amount of stack space used for auxvec, envp & argv exactly matches the amount allocated. This catches if DLINFO_ITEMS isn't updated when another NEW_AUX_ENT is added. Signed-off-by: James Hogan Cc: Riku Voipio Cc: Peter Maydell --- This should be applied after "linux-user: Correct DLINFO_ITEMS" or the assert will fail. Tested with linux-user-test-0.3 before and after fixing DLINFO_ITEMS. --- linux-user/elfload.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index d2380b6..ecf6f35 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1455,6 +1455,8 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, info->auxv_len = sp_auxv - sp; sp = loader_build_argptr(envc, argc, sp, p, 0); + /* Check the right amount of stack was allocated for auxvec, envp & argv. */ + assert(sp_auxv - sp == size); return sp; } -- 1.8.3.2