From patchwork Wed Aug 2 22:19:36 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: 130194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp776286vqx; Wed, 2 Aug 2023 15:55:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlFwNA9mOWCNJ32PbYrLgwjA/+LjgZjGO80hoGAgcEe1Yy0PAZ2BKKykM7Iny0NSjGdrrlwn X-Received: by 2002:a05:6a00:2d23:b0:67f:8ef5:2643 with SMTP id fa35-20020a056a002d2300b0067f8ef52643mr14728903pfb.2.1691016953090; Wed, 02 Aug 2023 15:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691016953; cv=none; d=google.com; s=arc-20160816; b=U2IE3oqwniz9Ao1B2qmDthFSEA+hQiv1yWjn7OFRW3vnoJjFeZLkNd0hXt5s+wVvNu fy7J8VpvEPEMeay5JC3y4DWPBG57lbEyP39THZjg8feVPfUv7S/Ld87W2Vhj52DLQJKY Wj559EXwvM1mbzC7ABq6/vm+/iyALxNi1nGX8X6/qVrceZusXIeq2lUbSHhNxoFMAIN8 gN23mYU6lEFG+J4IveoFUr5oFm+K7EtnYTNRwjbFlJV2MEL9OR1nLZiXi4AwqTUgo1LG NVIQLt+ruVxCqQ65VijUrKdGeLjelGKoHUhVS96zAkuAvPPDV3M5mgxk1nkZsp9+f2O9 xRKQ== 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=pwNDUxRB22ducScdriZJp4Pt+IAZ8QVpg2bxaMumOV4=; fh=Gre39lXhlvd0HqZD6zlwoEbeK/+QSH4w+yvCIh7xECs=; b=Y94CoDOdkH6sZnjoAXWwKyVLzDUb1fh7LPAqWwcNDK0yhZFZ1Fu44dj/YoXxpc1JSc /wk+QhfbvXT7kcP3NPSHtDZykj80IUBqIAHUYjhnk0kllVqGau/IPUCDQEAmYOev2pei S4cxRXlgIGRdnPJMkosbqPgsoaH+n8IzFtLgNH/58taAlA9OjwelwoijA+ORY2o0AZnX 5XZBk+WiJsVrAhPqReEO/acvdcI8rB/z/TU5K62aWYsEmAgGPYmu8vQH9qI1Vyc8GiEm j0Mnt9Yutsi8DOsi60PufTiN41CaYqwWvbkgQQPYba71gb2c4taA54bLR4KAcc9nKRK5 S/og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nUpLrNNR; dkim=neutral (no key) header.i=@linutronix.de; 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 c10-20020a056a000aca00b0067c03d5624csi11662897pfl.293.2023.08.02.15.55.39; Wed, 02 Aug 2023 15:55:53 -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=nUpLrNNR; dkim=neutral (no key) header.i=@linutronix.de; 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 S231433AbjHBWVI (ORCPT + 99 others); Wed, 2 Aug 2023 18:21:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232699AbjHBWUb (ORCPT ); Wed, 2 Aug 2023 18:20:31 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08CF92D7B; Wed, 2 Aug 2023 15:19:39 -0700 (PDT) Date: Wed, 02 Aug 2023 22:19:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691014777; 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=pwNDUxRB22ducScdriZJp4Pt+IAZ8QVpg2bxaMumOV4=; b=nUpLrNNRViINLIUJNOqxgbkT5JNFaDaz3BuGXTlaUxRVboMmTaEm5sW0frVWtTaGI30aXo rThfcr9OcL4/CZJrgJfLDQ1EVr7w/VHyD+GaUuN0LQk39iLbQ+Wg1VEIl0HING5kVra/cg QT0SAf8dDwKu1WGWfLc7FydTEmOSgV7NBFZ23kN0A141cj2oMY/zlRvsqf2moeGQc0O8Si l1ZgxkOJ1KBTl2o4N0Osq0Gln84CFFcbEeqczLKQW9QUil2AaSDiTcpRHONcv475yYsBsf deSGYeP6WiE7e00ZMGCNj1vS2fX8gZi6Ai2XxmEcLa1mfwVekqJ/QbW4VS9sNw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691014777; 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=pwNDUxRB22ducScdriZJp4Pt+IAZ8QVpg2bxaMumOV4=; b=fMVeqtD8e5ZyHk5Yf+LgUN5iBgpo5SPjEYPLVen/YwPAaHnoGBO3y2lhVIAAu9Mux+DWdT lAn5Im30pQJKl4DQ== 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: Introduce userspace API for shadow stack Cc: "Kirill A. Shutemov" , 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: <169101477654.28540.3534090663659038498.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: 1773159792519770725 X-GMAIL-MSGID: 1773159792519770725 The following commit has been merged into the x86/shstk branch of tip: Commit-ID: 98cfa4630912a80a575277d1bf193376ba66116a Gitweb: https://git.kernel.org/tip/98cfa4630912a80a575277d1bf193376ba66116a Author: Rick Edgecombe AuthorDate: Mon, 12 Jun 2023 17:10:52 -07:00 Committer: Dave Hansen CommitterDate: Wed, 02 Aug 2023 15:01:50 -07:00 x86: Introduce userspace API for shadow stack Add three new arch_prctl() handles: - ARCH_SHSTK_ENABLE/DISABLE enables or disables the specified feature. Returns 0 on success or a negative value on error. - ARCH_SHSTK_LOCK prevents future disabling or enabling of the specified feature. Returns 0 on success or a negative value on error. The features are handled per-thread and inherited over fork(2)/clone(2), but reset on exec(). Co-developed-by: Kirill A. Shutemov Signed-off-by: Kirill A. Shutemov 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-27-rick.p.edgecombe%40intel.com --- arch/x86/include/asm/processor.h | 6 ++++- arch/x86/include/asm/shstk.h | 21 ++++++++++++++- arch/x86/include/uapi/asm/prctl.h | 6 ++++- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/process_64.c | 6 ++++- arch/x86/kernel/shstk.c | 44 ++++++++++++++++++++++++++++++- 6 files changed, 85 insertions(+) create mode 100644 arch/x86/include/asm/shstk.h create mode 100644 arch/x86/kernel/shstk.c diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index d46300e..4e35f40 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -28,6 +28,7 @@ struct vm86; #include #include #include +#include #include #include @@ -475,6 +476,11 @@ struct thread_struct { */ u32 pkru; +#ifdef CONFIG_X86_USER_SHADOW_STACK + unsigned long features; + unsigned long features_locked; +#endif + /* Floating point and extended processor state */ struct fpu fpu; /* diff --git a/arch/x86/include/asm/shstk.h b/arch/x86/include/asm/shstk.h new file mode 100644 index 0000000..ec75380 --- /dev/null +++ b/arch/x86/include/asm/shstk.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_SHSTK_H +#define _ASM_X86_SHSTK_H + +#ifndef __ASSEMBLY__ +#include + +struct task_struct; + +#ifdef CONFIG_X86_USER_SHADOW_STACK +long shstk_prctl(struct task_struct *task, int option, unsigned long features); +void reset_thread_features(void); +#else +static inline long shstk_prctl(struct task_struct *task, int option, + unsigned long arg2) { return -EINVAL; } +static inline void reset_thread_features(void) {} +#endif /* CONFIG_X86_USER_SHADOW_STACK */ + +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_X86_SHSTK_H */ diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index e8d7ebb..1cd44ec 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -23,9 +23,15 @@ #define ARCH_MAP_VDSO_32 0x2002 #define ARCH_MAP_VDSO_64 0x2003 +/* Don't use 0x3001-0x3004 because of old glibcs */ + #define ARCH_GET_UNTAG_MASK 0x4001 #define ARCH_ENABLE_TAGGED_ADDR 0x4002 #define ARCH_GET_MAX_TAG_BITS 0x4003 #define ARCH_FORCE_TAGGED_SVA 0x4004 +#define ARCH_SHSTK_ENABLE 0x5001 +#define ARCH_SHSTK_DISABLE 0x5002 +#define ARCH_SHSTK_LOCK 0x5003 + #endif /* _ASM_X86_PRCTL_H */ diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index abee056..6b6bf47 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -147,6 +147,8 @@ obj-$(CONFIG_CALL_THUNKS) += callthunks.o obj-$(CONFIG_X86_CET) += cet.o +obj-$(CONFIG_X86_USER_SHADOW_STACK) += shstk.o + ### # 64 bit specific files ifeq ($(CONFIG_X86_64),y) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3d181c1..0f89aa0 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -515,6 +515,8 @@ start_thread_common(struct pt_regs *regs, unsigned long new_ip, load_gs_index(__USER_DS); } + reset_thread_features(); + loadsegment(fs, 0); loadsegment(es, _ds); loadsegment(ds, _ds); @@ -894,6 +896,10 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) else return put_user(LAM_U57_BITS, (unsigned long __user *)arg2); #endif + case ARCH_SHSTK_ENABLE: + case ARCH_SHSTK_DISABLE: + case ARCH_SHSTK_LOCK: + return shstk_prctl(task, option, arg2); default: ret = -EINVAL; break; diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c new file mode 100644 index 0000000..41ed655 --- /dev/null +++ b/arch/x86/kernel/shstk.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * shstk.c - Intel shadow stack support + * + * Copyright (c) 2021, Intel Corporation. + * Yu-cheng Yu + */ + +#include +#include +#include + +void reset_thread_features(void) +{ + current->thread.features = 0; + current->thread.features_locked = 0; +} + +long shstk_prctl(struct task_struct *task, int option, unsigned long features) +{ + if (option == ARCH_SHSTK_LOCK) { + task->thread.features_locked |= features; + return 0; + } + + /* Don't allow via ptrace */ + if (task != current) + return -EINVAL; + + /* Do not allow to change locked features */ + if (features & task->thread.features_locked) + return -EPERM; + + /* Only support enabling/disabling one feature at a time. */ + if (hweight_long(features) > 1) + return -EINVAL; + + if (option == ARCH_SHSTK_DISABLE) { + return -EINVAL; + } + + /* Handle ARCH_SHSTK_ENABLE */ + return -EINVAL; +}