From nobody Mon Apr 29 07:12:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530829653758561.5250608794366; Thu, 5 Jul 2018 15:27:33 -0700 (PDT) Received: from localhost ([::1]:55038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbCir-00022G-1G for importer@patchew.org; Thu, 05 Jul 2018 18:27:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbChz-0001j8-7A for qemu-devel@nongnu.org; Thu, 05 Jul 2018 18:26:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbChv-0001fa-Sh for qemu-devel@nongnu.org; Thu, 05 Jul 2018 18:26:39 -0400 Received: from smtp57.i.mail.ru ([217.69.128.37]:54132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fbChv-0001ax-KX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 18:26:35 -0400 Received: by smtp57.i.mail.ru with esmtpa (envelope-from ) id 1fbChs-0006RJ-1h; Fri, 06 Jul 2018 01:26:32 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=RpfKInGG7i5DppSOncCn+s2OssNVfbb+degcZv2OuP0=; b=YZnaGfhI6plL/AmxALlvV8OgOnSsRsefaGErYxs8WzOhhYOfFWneiXtdPAGJc4uLJrxlUmN0APXKZhD/2B94xBhAOzerpj1YUbsjTn0VmHRWz9rbG9Io9jyc1TRJ9xGCn2wYMDhkwMbR80PBN+b/KuHchiXGsGn3Eo9BjAzMJ6Y=; To: qemu-devel@nongnu.org Date: Fri, 6 Jul 2018 01:26:22 +0300 Message-Id: <20180705222622.17139-1-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 Authentication-Results: smtp57.i.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-7FA49CB5: 0D63561A33F958A5A15DAAFB3829AC31B66762F6C3410D93DDF24A0ACFE5168B0A6AB1C7CE11FEE35EF3C447179F0106BA3038C0950A5D36B5C8C57E37DE458B4C7702A67D5C33162DBA43225CD8A89F9FFED5BD9FB41755B287D9020BFCF125043C0C66DECA6D5443847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FFC2B27DE93B9EBF03B503F486389A921A5CC5B56E945C8DA X-Mailru-Sender: 7766D515518070DE138AAC7428EA760D8449059D152FE2744049CD14C760FCF5A8D17387A81429A57C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 217.69.128.37 Subject: [Qemu-devel] [PATCH v2] target/arm: Forbid unprivileged mode for M Baseline X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Julia Suvorova via Qemu-devel Reply-To: Julia Suvorova Cc: Peter Maydell , Jim Mussared , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , Joel Stanley , Stefan Hajnoczi , Julia Suvorova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" MSR handling is the only place where CONTROL.nPRIV is modified. Signed-off-by: Julia Suvorova Reviewed-by: Peter Maydell --- v2: * Add the check in the CONTROL_NS case target/arm/helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 5ee229eb35..2343aa5069 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10686,8 +10686,10 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t ma= skreg, uint32_t val) write_v7m_control_spsel_for_secstate(env, val & R_V7M_CONTROL_SPSEL= _MASK, M_REG_NS); - env->v7m.control[M_REG_NS] &=3D ~R_V7M_CONTROL_NPRIV_MASK; - env->v7m.control[M_REG_NS] |=3D val & R_V7M_CONTROL_NPRIV_MASK; + if (arm_feature(env, ARM_FEATURE_M_MAIN)) { + env->v7m.control[M_REG_NS] &=3D ~R_V7M_CONTROL_NPRIV_MASK; + env->v7m.control[M_REG_NS] |=3D val & R_V7M_CONTROL_NPRIV_= MASK; + } return; case 0x98: /* SP_NS */ { @@ -10781,8 +10783,10 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t ma= skreg, uint32_t val) !arm_v7m_is_handler_mode(env)) { write_v7m_control_spsel(env, (val & R_V7M_CONTROL_SPSEL_MASK) = !=3D 0); } - env->v7m.control[env->v7m.secure] &=3D ~R_V7M_CONTROL_NPRIV_MASK; - env->v7m.control[env->v7m.secure] |=3D val & R_V7M_CONTROL_NPRIV_M= ASK; + if (arm_feature(env, ARM_FEATURE_M_MAIN)) { + env->v7m.control[env->v7m.secure] &=3D ~R_V7M_CONTROL_NPRIV_MA= SK; + env->v7m.control[env->v7m.secure] |=3D val & R_V7M_CONTROL_NPR= IV_MASK; + } break; default: bad_reg: --=20 2.17.1