From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgAJm-00054s-Q9 for qemu-devel@nongnu.org; Fri, 02 May 2014 06:03:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgAJi-0006D3-NY for qemu-devel@nongnu.org; Fri, 02 May 2014 06:03:46 -0400 Received: from afflict.kos.to ([92.243.29.197]:47746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgAJi-0006Cm-GH for qemu-devel@nongnu.org; Fri, 02 May 2014 06:03:42 -0400 Date: Fri, 2 May 2014 13:03:40 +0300 From: Riku Voipio Message-ID: <20140502100340.GA3213@afflict.kos.to> References: <1395789710-29191-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [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: Peter Maydell Cc: Riku Voipio , James Hogan , QEMU Developers Hi, I've rolled up a new patchset to: https://git.linaro.org/people/riku.voipio/qemu.git/shortlog/refs/heads/linux-user-for-upstream Should I submit this or wait for your AT_HWCAP2 patch? Riku On Thu, May 01, 2014 at 07:08:29PM +0100, Peter Maydell wrote: > Ping! > > Riku -- do you have this in your tree now? > > (I'm adding an aux entry for AT_HWCAP2 and I noticed the > assert wasn't firing :-)) > > thanks > -- PMM > > On 25 March 2014 23:21, James Hogan wrote: > > 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 > >