From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGLQ-0007GO-OH for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:02:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlGLL-00046c-TY for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:02:48 -0500 Received: from afflict.kos.to ([92.243.29.197]:59749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGLL-00046N-OC for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:02:43 -0500 From: riku.voipio@linaro.org Date: Mon, 3 Nov 2014 14:02:40 +0200 Message-Id: <686581adcfead947b4726d82b1eaf7c25fa597e6.1415015510.git.riku.voipio@linaro.org> In-Reply-To: References: Subject: [Qemu-devel] [PULL 2/3] linux-user: Fix fault address truncation AArch64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Riku Voipio From: Riku Voipio On AArch64 the si_addr field of siginfo_t is truncated to 32 bits because the fault address passes through an uint32_t variable. Follow Peters suggestion and drop the uint32_t variable since its only used once in the Aarch64 loop. Reported-by: Amanieu d'Antras Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5887022..5c14c1e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1006,7 +1006,6 @@ void cpu_loop(CPUARMState *env) CPUState *cs = CPU(arm_env_get_cpu(env)); int trapnr, sig; target_siginfo_t info; - uint32_t addr; for (;;) { cpu_exec_start(cs); @@ -1042,12 +1041,11 @@ void cpu_loop(CPUARMState *env) /* fall through for segv */ case EXCP_PREFETCH_ABORT: case EXCP_DATA_ABORT: - addr = env->exception.vaddress; info.si_signo = SIGSEGV; info.si_errno = 0; /* XXX: check env->error_code */ info.si_code = TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr = addr; + info._sifields._sigfault._addr = env->exception.vaddress; queue_signal(env, info.si_signo, &info); break; case EXCP_DEBUG: -- 2.1.1