From nobody Sat May 4 03:09:01 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 1530736665611910.204823127246; Wed, 4 Jul 2018 13:37:45 -0700 (PDT) Received: from localhost ([::1]:49177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faoX2-0006Pg-Sm for importer@patchew.org; Wed, 04 Jul 2018 16:37:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faoWF-00066a-0s for qemu-devel@nongnu.org; Wed, 04 Jul 2018 16:36:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faoWB-0001Ca-SJ for qemu-devel@nongnu.org; Wed, 04 Jul 2018 16:36:55 -0400 Received: from smtp1.mail.ru ([94.100.179.111]:41454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faoWB-0001Bp-Gq for qemu-devel@nongnu.org; Wed, 04 Jul 2018 16:36:51 -0400 Received: by smtp1.mail.ru with esmtpa (envelope-from ) id 1faoW9-0004p2-3Q; Wed, 04 Jul 2018 23:36:49 +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=6HfWsZU9LiQpPDnh9ETzyr8L1zpwP67bh1neMkiOVm8=; b=KpeUTOtJGKdatonV/yivIs4f7JwFibgzJXC9R0RktE7rBwJM7BIxLDAJxdJ8j2PULGXc/z5z9Pp7cQMDlRpQmHlytqcEUnH89Fz+bFbs++B16lVM76aBOg5aquhc3aAWdKEBTtynlK1pJLTvqY0zRhCxXIRpqW8gIPzrb2uitz8=; To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2018 23:36:39 +0300 Message-Id: <20180704203639.29553-1-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 Authentication-Results: smtp1.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-7FA49CB5: 0D63561A33F958A546D730C94C3E195D7A1DB105B3199CC0C0440B95AB2430220A6AB1C7CE11FEE35EF3C447179F0106BA3038C0950A5D36B5C8C57E37DE458B4C7702A67D5C33162DBA43225CD8A89F0A35B161A8BF67C17BBEEA77B372C496DE4CAE6281C7766143847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148F458B267F216095A92623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-Mailru-Sender: 7766D515518070DE138AAC7428EA760D24A01AE1771F46394D215BA1E7FAB48076CE0944C6A90CC17C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 94.100.179.111 Subject: [Qemu-devel] [PATCH] 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 --- target/arm/helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 5ee229eb35..83cca554ad 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10781,8 +10781,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