From patchwork Mon Nov 9 01:11:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Davidsaver X-Patchwork-Id: 541527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AA959140D16 for ; Mon, 9 Nov 2015 12:14:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=cSky7kTW; dkim-atps=neutral Received: from localhost ([::1]:49350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvb22-0002XK-Ju for incoming@patchwork.ozlabs.org; Sun, 08 Nov 2015 20:14:02 -0500 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 Received: from mail-qk0-x22d.google.com ([2607:f8b0:400d:c09::22d]:33215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvb1K-0007u7-JB; Sun, 08 Nov 2015 20:13:18 -0500 Received: by qkas77 with SMTP id s77so61962345qka.0; Sun, 08 Nov 2015 17:13:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o9d2HY1ekIVFaVGdmhNsYzEXvAz3FMsq3Hs0L4dXGfY=; b=cSky7kTWYwh9fwDGbsYAs/1bTGNSmWMfsTViXE94wVQHAawp22uXV53XcsQzGCdwdD YQ3LUHKcnkaC9UvgzxQZRLTVzhzcQkOLHdH0IzeQRbU2GpgWu88dXaVb7+wgAja+VxjI iB4gFcrIW922qoBt9rtI8zhIrACNdy89bFivQMKFlaJqD6iYknZUc03Pzbu2Ym9xXT3a 16JEIaqzJSfHMgS3N6PrTy7YZX3VcKLsomiCfyzDdzwG5L3QWCoKyIn7IfVYF4qOdBoW bU114Fm6poGeJ6wEs6A9K0ynW3fQoEEbVpwTSfzx3+m3gf7IuManqy2M6GZ9geKpO7VK n8SQ== X-Received: by 10.55.73.18 with SMTP id w18mr26848045qka.95.1447031598196; Sun, 08 Nov 2015 17:13:18 -0800 (PST) Received: from localhost.localdomain (ool-182df582.dyn.optonline.net. [24.45.245.130]) by smtp.gmail.com with ESMTPSA id g97sm3915552qge.6.2015.11.08.17.13.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Nov 2015 17:13:17 -0800 (PST) From: Michael Davidsaver To: qemu-devel@nongnu.org Date: Sun, 8 Nov 2015 20:11:31 -0500 Message-Id: <1447031505-12477-5-git-send-email-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447031505-12477-1-git-send-email-mdavidsaver@gmail.com> References: <1447031505-12477-1-git-send-email-mdavidsaver@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::22d Cc: Peter Maydell , Peter Crosthwaite , qemu-arm@nongnu.org, Michael Davidsaver Subject: [Qemu-devel] [PATCH 04/18] armv7m: Explicit error for bad vector table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {