From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvb1O-0001KY-4F for qemu-devel@nongnu.org; Sun, 08 Nov 2015 20:13:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvb1K-0007uC-NK for qemu-devel@nongnu.org; Sun, 08 Nov 2015 20:13:22 -0500 From: Michael Davidsaver Date: Sun, 8 Nov 2015 20:11:31 -0500 Message-Id: <1447031505-12477-5-git-send-email-mdavidsaver@gmail.com> In-Reply-To: <1447031505-12477-1-git-send-email-mdavidsaver@gmail.com> References: <1447031505-12477-1-git-send-email-mdavidsaver@gmail.com> Subject: [Qemu-devel] [PATCH 04/18] armv7m: Explicit error for bad vector table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , qemu-arm@nongnu.org, Michael Davidsaver Give an explicit error and abort when a load from VECBASE fails. Otherwise would likely jump to 0, which for v7-m holds the reset stack pointer address. Signed-off-by: Michael Davidsaver --- target-arm/helper.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 4178400..1d7ac43 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5496,7 +5496,17 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) /* Clear IT bits */ env->condexec_bits = 0; env->regs[14] = lr; - addr = ldl_phys(cs->as, env->v7m.vecbase + env->v7m.exception * 4); + { + MemTxResult result; + addr = address_space_ldl(cs->as, + env->v7m.vecbase + env->v7m.exception * 4, + MEMTXATTRS_UNSPECIFIED, &result); + if (result != MEMTX_OK) { + cpu_abort(cs, "Failed to read from exception vector table " + "entry %08x\n", + env->v7m.vecbase + env->v7m.exception * 4); + } + } env->regs[15] = addr & 0xfffffffe; env->thumb = addr & 1; if (!env->thumb) { -- 2.1.4