Message ID | 1507305585-20608-8-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 3919e60b6efd9a86a0e6ba637aa584222855ac3a |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1989416qgn; Fri, 6 Oct 2017 09:34:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAOffhLAORy3ZA3ECoUboo0+EWXiXf9ms1juI/rBdHH5pV9GEqtfduay7/UcoeK3Oo6JG5z X-Received: by 10.55.212.70 with SMTP id l67mr8288881qki.140.1507307682620; Fri, 06 Oct 2017 09:34:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507307682; cv=none; d=google.com; s=arc-20160816; b=kbgA9RNK5YV1VYeWTSsHjWI4lCcB6QxUzLEqjCUmGaEYzdMq4CvWwxD0Z57QP20NZK tqCnvpme/9pKNJtETUU3a+o6w+RjC0vqaOaveaigmybvsr0DtNU/R2EjdMp8YXhSGZ9p VvpYomBt7KgNbe7xi0HnZj1ZCj7lEKUmfO6eFR0EpUC9DNuBunGX8oktEFrGqv0x7te0 d5UZuVH+fKKnOSTwHEmBxq/nqW/OWgg52hSj2FIXlAymNYIPf07Ykuo2ftFxvl5syIW0 eWr985Mq/uKTw1drrhct4DPMixjgorKBWjiVu3PKGMnFqsyJvubfk4RFPhQxs7Fd6CXy /xNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=NxHDbuYRgk7IUo3dht+JAwzxrblHyi+zcWeamfz+JFI=; b=GBOxr9CABi855+7YrPOH2KZ3Mxy8061hQSu1bEd/QgmSEYbfZu18Xb5ScRPKciE6YA v5dMSOz10zF2hBqQojJlPuDfNklF3rhb4QT9AymqR5wxOh75qzXOdRX/qBQFQZd+tdgf tXgkAw5AcPXybt+TmXljkofrqJ6YQPRtF4Qcrd7OTBTtFFqezzUIs4R8DJlYx/zZzydg s91VU7Zd/IwN0ZpqKWD7xScyItc73cyoiVffFyL0390ZSBV/Ge0uUXpMrWHXEOXo3b4+ n2esKZpkZ9IUN8RRHptlbHPYaBuwsmwq1CVhNXWPmH4sa0e9qi8PG16w2vKTWplvvhqa CUBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r64si631383qkb.215.2017.10.06.09.34.42 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 Oct 2017 09:34:42 -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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1e0VaE-0001IR-5J for patch@linaro.org; Fri, 06 Oct 2017 12:34:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1e0V1m-0004Eq-9x for qemu-devel@nongnu.org; Fri, 06 Oct 2017 11:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1e0V1k-0007pU-LK for qemu-devel@nongnu.org; Fri, 06 Oct 2017 11:59:06 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1e0V1k-0007eF-DH for qemu-devel@nongnu.org; Fri, 06 Oct 2017 11:59:04 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1e0V1b-0002u1-PK for qemu-devel@nongnu.org; Fri, 06 Oct 2017 16:58:55 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 6 Oct 2017 16:59:32 +0100 Message-Id: <1507305585-20608-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507305585-20608-1-git-send-email-peter.maydell@linaro.org> References: <1507305585-20608-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 07/20] target/arm: Restore security state on exception return X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index 36173e2..b82fc9f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6381,6 +6381,8 @@ static void do_v7m_exception_exit(ARMCPU *cpu) */ write_v7m_control_spsel(env, return_to_sp_process); + switch_v7m_security_state(env, return_to_secure); + { /* The stack pointer we should be reading the exception frame from * depends on bits in the magic exception return type value (and