From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJxA-0001l0-13 for qemu-devel@nongnu.org; Mon, 19 May 2014 05:33:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmJx9-0008SJ-7M for qemu-devel@nongnu.org; Mon, 19 May 2014 05:33:51 -0400 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:52527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJx8-0008SB-Tj for qemu-devel@nongnu.org; Mon, 19 May 2014 05:33:51 -0400 Received: by mail-wg0-f48.google.com with SMTP id b13so7658482wgh.7 for ; Mon, 19 May 2014 02:33:50 -0700 (PDT) From: "Edgar E. Iglesias" Date: Mon, 19 May 2014 19:22:56 +1000 Message-Id: <1400491383-6725-16-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> References: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v3 15/22] target-arm: A64: Forbid ERET to unimplemented ELs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net From: "Edgar E. Iglesias" Check for EL2 support before returning to it. Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias --- target-arm/op_helper.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index a6eedb2..d89755a 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -411,12 +411,11 @@ void HELPER(exception_return)(CPUARMState *env) env->regs[15] = env->elr_el[1] & ~0x1; } else { new_el = extract32(spsr, 2, 2); - if (new_el > cur_el) { - /* Disallow returns to higher ELs than the current one. */ - goto illegal_return; - } - if (new_el > 1) { - /* Return to unimplemented EL */ + if (new_el > cur_el + || (new_el == 2 && !arm_feature(env, ARM_FEATURE_EL2))) { + /* Disallow return to an EL which is unimplemented or higher + * than the current one. + */ goto illegal_return; } if (extract32(spsr, 1, 1)) { -- 1.8.3.2