From patchwork Tue May 27 16:28:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31000 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1BAB02066E for ; Tue, 27 May 2014 16:34:56 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id pa12sf38394052veb.3 for ; Tue, 27 May 2014 09:34:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=76loKzOlxGALPTVnupRlhWtfExX6fDEsQbgVovJf9nk=; b=imLp2xJMjdGojXfJxmwkve6iat5snWkC2W9LJOBq1NyL8OQFxfYQgmR4G4L0G3smFz XfqT+GmwaQRqwAtrz5HPIR1Op3NNKFivNd9jUEN42pSCEbolcW4tfjYbcL1PWFh3VDm7 JHvPLxvrPj5brf64J8qv3PGyG+tnlaJD4Js/0m9wlowx07VGIvywINXVs6GumEzcHP96 cJ1sQVIItPsN3YGshSCWC5zXeQUpn1R9dV511JVzbrk93NvokrpEdh0xe5e3Ex2QqrYW 7ya/4tVF9KHnG5nIVfKsYxC5Mu6bOEgPwEQC27h+GtRsEVZlt3biEbhZnvOj0wHcrNbY bRkA== X-Gm-Message-State: ALoCoQkYhJch5AvQ5DfnMNtDUspvSWs9RddwROCnkBNBUWXrMVzKi8DEYKytW37zcXKsn6xr7ADy X-Received: by 10.236.110.68 with SMTP id t44mr12791009yhg.31.1401208495658; Tue, 27 May 2014 09:34:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.103 with SMTP id 94ls905043qgw.13.gmail; Tue, 27 May 2014 09:34:55 -0700 (PDT) X-Received: by 10.221.19.196 with SMTP id ql4mr1928917vcb.64.1401208495513; Tue, 27 May 2014 09:34:55 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id qb7si8490401vcb.43.2014.05.27.09.34.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:34:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hq11so5167206vcb.19 for ; Tue, 27 May 2014 09:34:55 -0700 (PDT) X-Received: by 10.58.185.165 with SMTP id fd5mr2726878vec.41.1401208495366; Tue, 27 May 2014 09:34:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp133140vcb; Tue, 27 May 2014 09:34:55 -0700 (PDT) X-Received: by 10.140.32.195 with SMTP id h61mr41180149qgh.10.1401208494908; Tue, 27 May 2014 09:34:54 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z2si18188127qai.56.2014.05.27.09.34.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:36541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKKz-0004SK-Uq for patch@linaro.org; Tue, 27 May 2014 12:34:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF4-00037F-5B for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF3-0002pp-Dv for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:46 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF3-0002lf-8E for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:45 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEt-0005rc-E4; Tue, 27 May 2014 17:28:35 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:28 +0100 Message-Id: <1401208114-22404-21-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> References: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 20/26] target-arm: A64: Forbid ERET to higher or unimplemented ELs 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-18-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/op_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index c2b4bf0..e95a7f4 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -389,6 +389,7 @@ void HELPER(exception_return)(CPUARMState *env) unsigned int spsr_idx = aarch64_banked_spsr_index(1); uint32_t spsr = env->banked_spsr[spsr_idx]; int new_el, i; + int cur_el = arm_current_pl(env); if (env->pstate & PSTATE_SP) { env->sp_el[1] = env->xregs[31]; @@ -410,8 +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 > 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)) {