From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNirQ-0007Mx-7j for qemu-devel@nongnu.org; Wed, 12 Mar 2014 09:06:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNirK-00067q-Iv for qemu-devel@nongnu.org; Wed, 12 Mar 2014 09:06:16 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNirK-000674-Bp for qemu-devel@nongnu.org; Wed, 12 Mar 2014 09:06:10 -0400 From: Peter Maydell Date: Wed, 12 Mar 2014 13:06:00 +0000 Message-Id: <1394629561-11813-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1394629561-11813-1-git-send-email-peter.maydell@linaro.org> References: <1394629561-11813-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/2] linux-user/signal.c: Correct error path for AArch64 do_rt_sigreturn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , patches@linaro.org The error path in AArch64 do_rt_sigreturn() which fails before attempting lock_user_struct() was doing an unlock_user_struct() on an uninitialized variable. Initialize frame to NULL so we can use the same error-exit path in all cases (unlock of NULL is permitted and does nothing). Signed-off-by: Peter Maydell --- linux-user/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index c8a1da0..8c4a32d 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1334,7 +1334,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, long do_rt_sigreturn(CPUARMState *env) { - struct target_rt_sigframe *frame; + struct target_rt_sigframe *frame = NULL; abi_ulong frame_addr = env->xregs[31]; if (frame_addr & 15) { -- 1.9.0