From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CDA6C636CC for ; Sat, 18 Feb 2023 21:17:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B338280021; Sat, 18 Feb 2023 16:16:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 98A70280022; Sat, 18 Feb 2023 16:16:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80407280021; Sat, 18 Feb 2023 16:16:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 713BD280019 for ; Sat, 18 Feb 2023 16:16:30 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 48043AAD75 for ; Sat, 18 Feb 2023 21:16:30 +0000 (UTC) X-FDA: 80481671340.14.2361DD0 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf12.hostedemail.com (Postfix) with ESMTP id 5786440009 for ; Sat, 18 Feb 2023 21:16:28 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=g3CJyg7J; spf=pass (imf12.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676754988; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=riAGnKk0Xm3+kCwcX8Y629XRcWsNr1jeCHfuvNkZ9dw=; b=PC+r53/OuOB17V2rLV3bJaTHIW2gxpYwUH3d4EQA8ft5fSs9z7n5WoNWo2leYaLiENzQkP YFzSzT05IScUpq5jKG2uhzsm9qxeZjVNkZB74Obmurk7HaNwAlYIHY0GW1ZilxxuaeJlkg siz/wUTihYbOePnm/lBgwdZXEa3WcyQ= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=g3CJyg7J; spf=pass (imf12.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676754988; a=rsa-sha256; cv=none; b=weFt2IUw8aE7Ld/odPYlumWfat9k9IWSXSHKhA6pJqXOCPiJY0LwDOjUaX6YKJfSz374AD 8/APv6wY7837woTOakOWpOjeS/Ixtv1E5MZhyw53N6DKx+xeK8MRiWum+1c0pDHcS8wT+T cQmn4tWKzLKEZdLQ+YdfJkh1qd8O/S8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676754988; x=1708290988; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=qXZkRuAhvszhsNxk9zQmBL4ipRAOhXZVRz3O0rxB2RI=; b=g3CJyg7JjNZDH0mBwgMb4RT1gv14ZVq1lq4LbtmMVxkJA3sOsujaE25P 7asp/2cnPPcJTVJGXMGqmBiDhEgTBkr03DoFEARKQgSTzx3CP8jrUnlZq 7KR2UXdUQvFq4Hcffqdu2/TwG74Sn2wNVs6Ym3YX4puqLubSmYnNbup7x b7iv4DkOAhPm076/7h8YRHV+ooRmd7kbUv06CnNLq12tlz+3f8w41fPs1 90wcDX4qcYPcf5soxbnnSItju9WY/MXi6kYUQFlaBK0Urki6rxyQZ68m4 bbIFpRMMzOwenOmI0MK9a6imAX5TRd9SuRF+NvwShMQYo/l56D1D2+Lv6 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="418427831" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="418427831" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:25 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="664241735" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="664241735" Received: from adityava-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.80.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:24 -0800 From: Rick Edgecombe To: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com Cc: rick.p.edgecombe@intel.com Subject: [PATCH v6 34/41] x86/shstk: Support WRSS for userspace Date: Sat, 18 Feb 2023 13:14:26 -0800 Message-Id: <20230218211433.26859-35-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218211433.26859-1-rick.p.edgecombe@intel.com> References: <20230218211433.26859-1-rick.p.edgecombe@intel.com> X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: kyeqiq7uw6e9fwwb4qip7p8d4xuf5xgb X-Rspamd-Queue-Id: 5786440009 X-HE-Tag: 1676754988-407731 X-HE-Meta: U2FsdGVkX18IjgSgVrJeKjq1Nh27xfFPlPqp2ZPeLvJLhszIfofUpu91damCAsY+8DwMUIwM+2Bf6Y6P0RZqeHK2SYvovZXorweH/UEX0i/vup6Xbvj7vf32G5fqWGDVXKMOrUi9WNWDB6IsPo33qNR7AhtL8vXJILwMA7HRqpig9mGHvut3a6yTlO/cNu/WqABA1cu0/9NcxcFAFKhqzZDLvFA7XfVOfVWqCyufuqfox8PNXkyit7Gw2+oYx2SanrkC/ARM/fxffhcgMN5PskX3kqiIWjhY3tXXiZzZ87ZsWZPz2T03T6jcGJ/x8RBEnZwZ1jOIl1hX2Z738Lvx8cF5bN/Pl87L2HGP5w5Fcc+xYz6udj6iGk+Zep7pbC4kxxibvtGVHJjTNKne/ExiNyRdCYJ4UDYvEdDyJUeExRncAbJunDjXDkmnT0NIrSUZV2go9q9HeQ9NHyd1kMH5bgE0eZQwbgInaZjBmkUGtCtri+aty7E/B8IvNeBACIXWVPWtiDHE2LLPmOUNGUc8KoprzGNTx4Zi5TIEbYqNEi6BLuftQCj5KblZuAuxqADBolHCcTT4Ygf0Tj1s/2zhiuH4MOdWWELxkK6ePiEuj6/fxb16PXxHYFosPkEsfuNKQOQnNgO1dnwg62pNNNmHLJ79kEtGayqmPVI74El/qCzwiyBnNzaWd9+t3oRve3PQClXmkqrXPIst8CZYHoV+kZ1wpxaQu/5/udQUWHarRzcpP098J+eo5ShF7dJt8YkJ+wG2Fl+YQoyrxIlsMQm6nae3szF6CESdNw7WcnKfBE6NrKe8UUrh1HfDb4O41GXjNwQCH+oK4YNgbTqva7ts6k+LzTkRNTQOz8skKNmotfFq2VDcu6uIP4II/PLBChe/sI44zQQlMoTTugqOlT2cryTNj0WoFhEOUg36qeO17AR2MqmWKq+4XaUkImh18rwIz3+vwxMTyVJJdjBl3kW wPDWxzC1 FWEYIkbkU02IP9i0Ef0rhbln4VXgX4IDVMO1WnZwsL4a/Y580Wxv+JAkXNVs1Czr571Gu0BofFczs07D77QR26REzh5aQC9EZr1Dm7gqNphz7Z5BXebkFs8TKj4bCUeUj1xBPoEY/IfJJYQLdC9Saw5hQIEi2JbIyXYxqFIbemU4CH/Z6C/KzZjDKrsFsOsSVtAH36EbW/2YvX0vyx09sW0tg24dDiEfLcEQlzBdwLn8ZdrFZSLy7FHK5kAyIUzhmHQMH/W9sbrPGmr/CybrC0itiMVSo9NyXaT96 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: For the current shadow stack implementation, shadow stacks contents can't easily be provisioned with arbitrary data. This property helps apps protect themselves better, but also restricts any potential apps that may want to do exotic things at the expense of a little security. The x86 shadow stack feature introduces a new instruction, WRSS, which can be enabled to write directly to shadow stack permissioned memory from userspace. Allow it to get enabled via the prctl interface. Only enable the userspace WRSS instruction, which allows writes to userspace shadow stacks from userspace. Do not allow it to be enabled independently of shadow stack, as HW does not support using WRSS when shadow stack is disabled. >From a fault handler perspective, WRSS will behave very similar to WRUSS, which is treated like a user access from a #PF err code perspective. Tested-by: Pengfei Xu Tested-by: John Allen Reviewed-by: Kees Cook Signed-off-by: Rick Edgecombe --- v6: - Make set_clr_bits_msrl() avoid side affects in 'msr' v5: - Switch to EOPNOTSUPP - Move set_clr_bits_msrl() to patch where it is first used - Commit log formatting v3: - Make wrss_control() static - Fix verbiage in commit log (Kees) v2: - Add some commit log verbiage from (Dave Hansen) v1: - New patch. --- arch/x86/include/asm/msr.h | 11 +++++++++++ arch/x86/include/uapi/asm/prctl.h | 1 + arch/x86/kernel/shstk.c | 32 ++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 65ec1965cd28..2d3b35c957ad 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -310,6 +310,17 @@ void msrs_free(struct msr *msrs); int msr_set_bit(u32 msr, u8 bit); int msr_clear_bit(u32 msr, u8 bit); +/* Helper that can never get accidentally un-inlined. */ +#define set_clr_bits_msrl(msr, set, clear) do { \ + u64 __val, __new_val, __msr = msr; \ + \ + rdmsrl(__msr, __val); \ + __new_val = (__val & ~(clear)) | (set); \ + \ + if (__new_val != __val) \ + wrmsrl(__msr, __new_val); \ +} while (0) + #ifdef CONFIG_SMP int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index 7dfd9dc00509..e31495668056 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -28,5 +28,6 @@ /* ARCH_SHSTK_ features bits */ #define ARCH_SHSTK_SHSTK (1ULL << 0) +#define ARCH_SHSTK_WRSS (1ULL << 1) #endif /* _ASM_X86_PRCTL_H */ diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index 0a3decab70ee..009cb3fa0ae5 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -363,6 +363,36 @@ void shstk_free(struct task_struct *tsk) unmap_shadow_stack(shstk->base, shstk->size); } +static int wrss_control(bool enable) +{ + if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK)) + return -EOPNOTSUPP; + + /* + * Only enable wrss if shadow stack is enabled. If shadow stack is not + * enabled, wrss will already be disabled, so don't bother clearing it + * when disabling. + */ + if (!features_enabled(ARCH_SHSTK_SHSTK)) + return -EPERM; + + /* Already enabled/disabled? */ + if (features_enabled(ARCH_SHSTK_WRSS) == enable) + return 0; + + fpregs_lock_and_load(); + if (enable) { + set_clr_bits_msrl(MSR_IA32_U_CET, CET_WRSS_EN, 0); + features_set(ARCH_SHSTK_WRSS); + } else { + set_clr_bits_msrl(MSR_IA32_U_CET, 0, CET_WRSS_EN); + features_clr(ARCH_SHSTK_WRSS); + } + fpregs_unlock(); + + return 0; +} + static int shstk_disable(void) { if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK)) @@ -379,7 +409,7 @@ static int shstk_disable(void) fpregs_unlock(); shstk_free(current); - features_clr(ARCH_SHSTK_SHSTK); + features_clr(ARCH_SHSTK_SHSTK | ARCH_SHSTK_WRSS); return 0; } -- 2.17.1