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 D39CFC433F5 for ; Mon, 3 Oct 2022 18:04:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FC896B0071; Mon, 3 Oct 2022 14:04:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 684138E0002; Mon, 3 Oct 2022 14:04:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D7068E0001; Mon, 3 Oct 2022 14:04:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3594A6B0071 for ; Mon, 3 Oct 2022 14:04:31 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 09E441607C3 for ; Mon, 3 Oct 2022 18:04:31 +0000 (UTC) X-FDA: 79980413142.24.38375BA Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf01.hostedemail.com (Postfix) with ESMTP id 85F7040023 for ; Mon, 3 Oct 2022 18:04:30 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id lx7so10579567pjb.0 for ; Mon, 03 Oct 2022 11:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=/dv15tDc2ktB7BAbAEqIaqb+HPgnCrw6tzjaeXZYRdw=; b=Luxyct5ZDEAf+s4tZkbPi5QWvqscJMmjQmwgPzdkwonol+VoRlsiuiHoPDe6z649HT GdmX3uXicFJo82Sjaz8mQCGFSRAQfkLCvV3r9epbDHNd85DICH2NOHamMJ/YfINRznXm RCqqekGfOD/I6JxvPfwxxVlkhxNGcYPH6wMo8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=/dv15tDc2ktB7BAbAEqIaqb+HPgnCrw6tzjaeXZYRdw=; b=MuisK0BQN9QLsAfLsEq07apR0A55lvnlce1TOXmC38iSHfZA5U+uvDX51o9ywrcAsk XLPpI9ps1cM97AeCkUiR4EOvy9c5ors3m2BAog3gB6iGDUgkLDxWS5eymXgNjdBdqHLG vQgBPXJRswSKqEvT+qWEhfhzu0RaqHc+r5hjtH4CRjvDBu0eBrfLlmRZg+uQXd8847PH CocoaXzVb9Eh3WfHhQZf31VRJT3upB+C1F0BLimkW6J0vvIe+hhYIabSs5zpsYAuGqXJ HNsXlX42Zj9lBrgWG8CXjs7d5jxUeaF9tbJ3RpypivpoKkFL2yPgiR8zy9LgI5X4ITxm YzIA== X-Gm-Message-State: ACrzQf3p/zBbm9pDyZfNI4NSvQo/fxTmqphzdhutBzF6lImpq+tqMGe2 mwtQopAQeGNcReZBgg2mQgYCSQ== X-Google-Smtp-Source: AMsMyM6vXQUnWXKFrzPL+QjSqkQ4PdOl+MhVlYguyVb6m/Z7eQkFgOnTSODHgfVf3aBpQ6ydA6TL9g== X-Received: by 2002:a17:90b:1a81:b0:20a:71e5:728d with SMTP id ng1-20020a17090b1a8100b0020a71e5728dmr12719181pjb.107.1664820269511; Mon, 03 Oct 2022 11:04:29 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id g8-20020a17090a4b0800b0020a61d0e4eesm5470654pjh.30.2022.10.03.11.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 11:04:28 -0700 (PDT) Date: Mon, 3 Oct 2022 11:04:27 -0700 From: Kees Cook To: Rick Edgecombe Cc: 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 , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V . Shankar" , Weijiang Yang , "Kirill A . Shutemov" , joao.moreira@intel.com, John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, Yu-cheng Yu , Michael Kerrisk Subject: Re: [PATCH v2 07/39] x86/cet: Add user control-protection fault handler Message-ID: <202210031055.62E60F6BBE@keescook> References: <20220929222936.14584-1-rick.p.edgecombe@intel.com> <20220929222936.14584-8-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220929222936.14584-8-rick.p.edgecombe@intel.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664820270; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/dv15tDc2ktB7BAbAEqIaqb+HPgnCrw6tzjaeXZYRdw=; b=HVBdcTLQd6RUy3xDtD47EmW1zs4m1JGZf2gzUAZY2BVrQxV7rp5DiNwmdimKNkLCx7s2XE s3ER5Ou6WEtmqogk9UF+bz+u6aAALrL0qazg3b3TOemyEERu3YXJFH79DF3dhaIJPTt7df QTkfuQQ8xeRWieH1Zg8w72J+T9ugsdo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Luxyct5Z; spf=pass (imf01.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.48 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664820270; a=rsa-sha256; cv=none; b=CtexTkRzon49qXQVf+1BPfpbO6IP9sbBM/Zangw/v/xFcUzqly9xELqsA4felA2OCqszAz neDLefgvm4IrOXGu1L9npimdR89uZvo2+P4ywJ0UYuMbVHDzgR7KPMeudEP8FnBl8bqIQH ZOlOxXXVzVlUTxB/tijRSVWudhQEHAc= X-Rspamd-Queue-Id: 85F7040023 Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Luxyct5Z; spf=pass (imf01.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.48 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: jtheeox4ft1pygzy3ogh4c8uzrocm7zg X-HE-Tag: 1664820270-721134 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: On Thu, Sep 29, 2022 at 03:29:04PM -0700, Rick Edgecombe wrote: > [...] > -#ifdef CONFIG_X86_KERNEL_IBT > +#if defined(CONFIG_X86_KERNEL_IBT) || defined(CONFIG_X86_SHADOW_STACK) This pattern is repeated several times. Perhaps there needs to be a CONFIG_X86_CET to make this more readable? Really just a style question. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b68eb75887b8..6cb52616e0cf 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1836,6 +1836,11 @@ config CC_HAS_IBT (CC_IS_CLANG && CLANG_VERSION >= 140000)) && \ $(as-instr,endbr64) +config X86_CET + def_bool n + help + CET features are enabled (IBT and/or Shadow Stack) + config X86_KERNEL_IBT prompt "Indirect Branch Tracking" bool @@ -1843,6 +1848,7 @@ config X86_KERNEL_IBT # https://github.com/llvm/llvm-project/commit/9d7001eba9c4cb311e03cd8cdc231f9e579f2d0f depends on !LD_IS_LLD || LLD_VERSION >= 140000 select OBJTOOL + select X86_CET help Build the kernel with support for Indirect Branch Tracking, a hardware support course-grain forward-edge Control Flow Integrity @@ -1945,6 +1951,7 @@ config X86_SHADOW_STACK def_bool n depends on ARCH_HAS_SHADOW_STACK select ARCH_USES_HIGH_VMA_FLAGS + select X86_CET help Shadow Stack protection is a hardware feature that detects function return address corruption. Today the kernel's support is limited to > [...] > +#if defined(CONFIG_X86_KERNEL_IBT) || defined(CONFIG_X86_SHADOW_STACK) > +DEFINE_IDTENTRY_ERRORCODE(exc_control_protection) > +{ > + if (!cpu_feature_enabled(X86_FEATURE_IBT) && > + !cpu_feature_enabled(X86_FEATURE_SHSTK)) { > + pr_err("Unexpected #CP\n"); > + BUG(); > + } I second Kirill's question here. This seems an entirely survivable (but highly unexpected) state. I think this whole "if" could just be replaced with: WARN_ON_ONCE(!cpu_feature_enabled(X86_FEATURE_IBT) && !cpu_feature_enabled(X86_FEATURE_SHSTK), "Unexpected #CP\n"); Otherwise this looks good to me. Reviewed-by: Kees Cook -- Kees Cook