commit 8c0f0a60d48a6f62c20f4ce77dceb82047d3d57f
author James Hogan <james.hogan@imgtec.com> Tue Mar 25 23:21:50 2014 +0000
committer Riku Voipio <riku.voipio@linaro.org> Fri May 02 21:59:27 2014 +0300
tree 0da1ea86abf4f4e068d15f286b4eb513247cd5a5
parent aa07f5ecf9828bb2ff8d796cb0b17ad8534201c7

linux-user: Assert stack used for auxvec, envp, argv

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 <james.hogan@imgtec.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

linux-user/elfload.c

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 @@
     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;
 }