From patchwork Wed Jul 19 22:47:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 122882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2765709vqt; Wed, 19 Jul 2023 16:14:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlENLYYB/7vs6cYBuSsqwx5K2MEno87urTz6xt2eWYK6KwpSzOsWxBx/thFpHj5Esgts8bW0 X-Received: by 2002:a05:6a20:4322:b0:134:70b7:2386 with SMTP id h34-20020a056a20432200b0013470b72386mr4659449pzk.9.1689808447593; Wed, 19 Jul 2023 16:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689808447; cv=none; d=google.com; s=arc-20160816; b=KdAXFne1Q4nZuKFIYhZrTtoCdWEwrjnu3C1lrxlJHGcGdkFfbRYTtuTsKxXDrAMQ+z drAb8VbCq3taripvY1RK6c0S9w39bQPNhH2b72guAOtwfO/8WLUnNUtgaLa65yUim7/+ e7FPPphm6dru9fzpych/XZCCVF5wD5y0ed1lDjNORQ0064/1APafPfCJWM5Hnjsb6A9v d/Cr+LsTaTB10aH2a+HCkOMbLi0sQoLSbu5c+6IqR3YkdrWmHfMV8PyR/tRpOjnWB/jv pRD5SXX6EbSuqp/1M0nuXIutQjkMPKBFDH6jS5rG8yAIOfR6UwQf8Fx2KZw0VJjS2usd GzGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=JS5U+75uWRaiIfyvB0FJk6OsUmK8ddDOtS1wobrlI4I=; fh=cYKsLYKlfL5GLDpOt1a9DaF93PQ8azQhO0iBCt+veh0=; b=EeY2LFh/QpYy3ydPHa5lXuXhYDQNGI8GsQJaXvyTRc7SXyV4dLChI6lOmZOW640mb3 X7xT3BP43hEXcuD2mOraTMv235/tPeyKCeXtkf/y+7y4nqROXhs6KP24Oa0XZs8yNAa9 5Qka/HN6xIpBCqBHOB1n6ha9qSm+wtOusAIItzDJiwU0h4ndEnqX7bOLuhBhfqQvE/JK kO249jTz2pGDp6qqBVS9/CxNQk3RoF36lgBsJJT9OH+et8OUMzp2z6IXBxCzgW2PFh29 6iwspa4ZPCwPaqvzharXr/rt1t4rkJhl69LWe7SYRQXauRm4rMzWYvZHRxQXv4bVsA/8 QBVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ECpnTyhc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e32-20020a635020000000b005533c53f5cesi4258516pgb.27.2023.07.19.16.13.55; Wed, 19 Jul 2023 16:14:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ECpnTyhc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbjGSWsR (ORCPT + 99 others); Wed, 19 Jul 2023 18:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230253AbjGSWrf (ORCPT ); Wed, 19 Jul 2023 18:47:35 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 747FD2100; Wed, 19 Jul 2023 15:47:33 -0700 (PDT) Date: Wed, 19 Jul 2023 22:47:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689806851; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS5U+75uWRaiIfyvB0FJk6OsUmK8ddDOtS1wobrlI4I=; b=ECpnTyhclrFw0ByLmc0giQmKtK4zmi3yY+rGJXKyeCLCBaDCQru8HoobssAWzRy3edX4vs SGw5LxbGVc2+XPiFah/UCj0VRa4xVGSgZ91AAgD/xBGks52A+Hf+cXz48z1g/UlPOo1Y/v XikiS+7LsvLg8SbuIKEJkpCuUNrACAg4+C3AGaI78G+41nceW84Vuad5Ko/dl43DBNgHMU c/vDFHEv1MDuPp7y/+5AxoSmEWBAju7kuRsgB7yRqJVQxmdi1KBcSUXkluidcZLEzlWbeI d8dTNptAXtn4QLNsqY9D1C8bItq8IOeSQx5Om59J8wJpcQTusysXKRFZtvT9Pw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689806851; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS5U+75uWRaiIfyvB0FJk6OsUmK8ddDOtS1wobrlI4I=; b=by3KIztOdPxITMBzv6WQV32KgbXUU99rKoCQvVo9sa5slzzBIBgwopvCHK9SI97lmpKOUp OvoX7hgL/sCwCSAw== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] x86/shstk: Introduce routines modifying shstk Cc: "Yu-cheng Yu" , Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168980685105.28540.12737044573975324647.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771892582872556415 X-GMAIL-MSGID: 1771892582872556415 The following commit has been merged into the x86/shstk branch of tip: Commit-ID: f0c70026e46b80db040ed89feb04ca53d359bf1b Gitweb: https://git.kernel.org/tip/f0c70026e46b80db040ed89feb04ca53d359bf1b Author: Rick Edgecombe AuthorDate: Mon, 12 Jun 2023 17:10:56 -07:00 Committer: Rick Edgecombe CommitterDate: Tue, 11 Jul 2023 14:12:50 -07:00 x86/shstk: Introduce routines modifying shstk Shadow stacks are normally written to via CALL/RET or specific CET instructions like RSTORSSP/SAVEPREVSSP. However, sometimes the kernel will need to write to the shadow stack directly using the ring-0 only WRUSS instruction. A shadow stack restore token marks a restore point of the shadow stack, and the address in a token must point directly above the token, which is within the same shadow stack. This is distinctively different from other pointers on the shadow stack, since those pointers point to executable code area. Introduce token setup and verify routines. Also introduce WRUSS, which is a kernel-mode instruction but writes directly to user shadow stack. In future patches that enable shadow stack to work with signals, the kernel will need something to denote the point in the stack where sigreturn may be called. This will prevent attackers calling sigreturn at arbitrary places in the stack, in order to help prevent SROP attacks. To do this, something that can only be written by the kernel needs to be placed on the shadow stack. This can be accomplished by setting bit 63 in the frame written to the shadow stack. Userspace return addresses can't have this bit set as it is in the kernel range. It also can't be a valid restore token. Co-developed-by: Yu-cheng Yu Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230613001108.3040476-31-rick.p.edgecombe%40intel.com --- arch/x86/include/asm/special_insns.h | 13 +++++- arch/x86/kernel/shstk.c | 75 +++++++++++++++++++++++++++- 2 files changed, 88 insertions(+) diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h index de48d13..d6cd934 100644 --- a/arch/x86/include/asm/special_insns.h +++ b/arch/x86/include/asm/special_insns.h @@ -202,6 +202,19 @@ static inline void clwb(volatile void *__p) : [pax] "a" (p)); } +#ifdef CONFIG_X86_USER_SHADOW_STACK +static inline int write_user_shstk_64(u64 __user *addr, u64 val) +{ + asm_volatile_goto("1: wrussq %[val], (%[addr])\n" + _ASM_EXTABLE(1b, %l[fail]) + :: [addr] "r" (addr), [val] "r" (val) + :: fail); + return 0; +fail: + return -EFAULT; +} +#endif /* CONFIG_X86_USER_SHADOW_STACK */ + #define nop() asm volatile ("nop") static inline void serialize(void) diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index bd9cdc3..e22928c 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -25,6 +25,8 @@ #include #include +#define SS_FRAME_SIZE 8 + static bool features_enabled(unsigned long features) { return current->thread.features & features; @@ -40,6 +42,35 @@ static void features_clr(unsigned long features) current->thread.features &= ~features; } +/* + * Create a restore token on the shadow stack. A token is always 8-byte + * and aligned to 8. + */ +static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) +{ + unsigned long addr; + + /* Token must be aligned */ + if (!IS_ALIGNED(ssp, 8)) + return -EINVAL; + + addr = ssp - SS_FRAME_SIZE; + + /* + * SSP is aligned, so reserved bits and mode bit are a zero, just mark + * the token 64-bit. + */ + ssp |= BIT(0); + + if (write_user_shstk_64((u64 __user *)addr, (u64)ssp)) + return -EFAULT; + + if (token_addr) + *token_addr = addr; + + return 0; +} + static unsigned long alloc_shstk(unsigned long size) { int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_ABOVE4G; @@ -157,6 +188,50 @@ unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, unsigned long cl return addr + size; } +static unsigned long get_user_shstk_addr(void) +{ + unsigned long long ssp; + + fpregs_lock_and_load(); + + rdmsrl(MSR_IA32_PL3_SSP, ssp); + + fpregs_unlock(); + + return ssp; +} + +#define SHSTK_DATA_BIT BIT(63) + +static int put_shstk_data(u64 __user *addr, u64 data) +{ + if (WARN_ON_ONCE(data & SHSTK_DATA_BIT)) + return -EINVAL; + + /* + * Mark the high bit so that the sigframe can't be processed as a + * return address. + */ + if (write_user_shstk_64(addr, data | SHSTK_DATA_BIT)) + return -EFAULT; + return 0; +} + +static int get_shstk_data(unsigned long *data, unsigned long __user *addr) +{ + unsigned long ldata; + + if (unlikely(get_user(ldata, addr))) + return -EFAULT; + + if (!(ldata & SHSTK_DATA_BIT)) + return -EINVAL; + + *data = ldata & ~SHSTK_DATA_BIT; + + return 0; +} + void shstk_free(struct task_struct *tsk) { struct thread_shstk *shstk = &tsk->thread.shstk;