From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
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 <arnd@arndb.de>,
Andy Lutomirski <luto@amacapital.net>,
Balbir Singh <bsingharora@gmail.com>,
Cyrill Gorcunov <gorcunov@gmail.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Eugene Syromiatnikov <esyr@redhat.com>,
Florian Weimer <fweimer@redhat.com>,
"H.J. Lu" <hjl.tools@gmail.com>, Jann Horn <jannh@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Kees Cook <keescook@chromium.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
Oleg Nesterov <oleg@redhat.com>, Pavel Machek <pavel@ucw.cz>,
Peter Zijlstra <peterz@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Vedvyas Shanbhogue <vedvyas.shanbhogue@intel.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [PATCH v5 01/11] x86/cet/ibt: Add Kconfig option for user-mode Indirect Branch Tracking
Date: Thu, 11 Oct 2018 08:16:44 -0700 [thread overview]
Message-ID: <20181011151654.27221-2-yu-cheng.yu@intel.com> (raw)
Message-ID: <20181011151644.AUjNNMuelx6tFTAWsM6PgEvaEaGdOV6xZQLyJJ53-9M@z> (raw)
In-Reply-To: <20181011151654.27221-1-yu-cheng.yu@intel.com>
The user-mode indirect branch tracking support is done mostly by
GCC to insert ENDBR64/ENDBR32 instructions at branch targets.
The kernel provides CPUID enumeration, feature MSR setup and
the allocation of legacy bitmap.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
---
arch/x86/Kconfig | 16 ++++++++++++++++
arch/x86/Makefile | 7 +++++++
2 files changed, 23 insertions(+)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ac2244896a18..dd65dae3c5cb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1919,6 +1919,9 @@ config X86_INTEL_CET
config ARCH_HAS_SHSTK
def_bool n
+config ARCH_HAS_AS_LIMIT
+ def_bool n
+
config ARCH_HAS_PROGRAM_PROPERTIES
def_bool n
@@ -1943,6 +1946,19 @@ config X86_INTEL_SHADOW_STACK_USER
If unsure, say y.
+config X86_INTEL_BRANCH_TRACKING_USER
+ prompt "Intel Indirect Branch Tracking for user-mode"
+ def_bool n
+ depends on CPU_SUP_INTEL && X86_64
+ select X86_INTEL_CET
+ select ARCH_HAS_AS_LIMIT
+ select ARCH_HAS_PROGRAM_PROPERTIES
+ ---help---
+ Indirect Branch Tracking provides hardware protection against return-/jmp-
+ oriented programming attacks.
+
+ If unsure, say y
+
config EFI
bool "EFI runtime service support"
depends on ACPI
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index b28842b80295..ff652bba849f 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -159,6 +159,13 @@ ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER
endif
endif
+# Check compiler ibt support
+ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER
+ ifeq ($(call cc-option-yn, -fcf-protection=branch), n)
+ $(error CONFIG_X86_INTEL_BRANCH_TRACKING_USER not supported by compiler)
+ endif
+endif
+
#
# If the function graph tracer is used with mcount instead of fentry,
# '-maccumulate-outgoing-args' is needed to prevent a GCC bug
--
2.17.1
next prev parent reply other threads:[~2018-10-11 22:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 15:16 [PATCH v5 00/11] Control Flow Enforcement: Branch Tracking, PTRACE Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu [this message]
2018-10-11 15:16 ` [PATCH v5 01/11] x86/cet/ibt: Add Kconfig option for user-mode Indirect Branch Tracking Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 02/11] x86/cet/ibt: User-mode indirect branch tracking support Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 03/11] x86/cet/ibt: Add IBT legacy code bitmap allocation function Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 04/11] mm/mmap: Add IBT bitmap size to address space limit check Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 05/11] x86/cet/ibt: ELF header parsing for IBT Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 06/11] x86/cet/ibt: Add arch_prctl functions " Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 07/11] x86/cet/ibt: Add ENDBR to op-code-map Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 08/11] x86: Insert endbr32/endbr64 to vDSO Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 09/11] x86/vsyscall/32: Add ENDBR32 to vsyscall entry point Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 10/11] x86/vsyscall/64: Add ENDBR64 to vsyscall entry points Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
2018-10-11 15:16 ` [PATCH v5 11/11] x86/cet: Add PTRACE interface for CET Yu-cheng Yu
2018-10-11 15:16 ` Yu-cheng Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181011151654.27221-2-yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=arnd@arndb.de \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=gorcunov@gmail.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=nadav.amit@gmail.com \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=vedvyas.shanbhogue@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).