[RFC,v3,19/20] x86/purgatory: Disable CFI

Message ID	20220610233513.1798771-20-samitolvanen@google.com (mailing list archive)
State	Changes Requested
Headers	show Return-Path: <linux-hardening-owner@kernel.org> Date: Fri, 10 Jun 2022 16:35:12 -0700 In-Reply-To: <20220610233513.1798771-1-samitolvanen@google.com> Message-Id: <20220610233513.1798771-20-samitolvanen@google.com> Mime-Version: 1.0 References: <20220610233513.1798771-1-samitolvanen@google.com> Subject: [RFC PATCH v3 19/20] x86/purgatory: Disable CFI From: Sami Tolvanen <samitolvanen@google.com> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Peter Zijlstra <peterz@infradead.org>, x86@kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Joao Moreira <joao@overdrivepizza.com>, Sedat Dilek <sedat.dilek@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen <samitolvanen@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KCFI support \| expand [RFC,v3,00/20] KCFI support [RFC,v3,01/20] treewide: Filter out CC_FLAGS_CFI [RFC,v3,02/20] scripts/kallsyms: Ignore __kcfi_typeid_ [RFC,v3,03/20] cfi: Remove CONFIG_CFI_CLANG_SHADOW [RFC,v3,04/20] cfi: Drop __CFI_ADDRESSABLE [RFC,v3,05/20] cfi: Switch to -fsanitize=kcfi [RFC,v3,06/20] cfi: Add type helper macros [RFC,v3,07/20] lkdtm: Emit an indirect call for CFI tests [RFC,v3,08/20] arm64: Add types to indirect called assembly functions [RFC,v3,09/20] arm64: Add CFI error handling [RFC,v3,10/20] arm64: Drop unneeded __nocfi attributes [RFC,v3,11/20] init: Drop __nocfi from __init [RFC,v3,12/20] treewide: Drop function_nocfi [RFC,v3,13/20] treewide: Drop WARN_ON_FUNCTION_MISMATCH [RFC,v3,14/20] treewide: Drop __cficanonical [RFC,v3,15/20] objtool: Disable CFI warnings [RFC,v3,16/20] kallsyms: Drop CONFIG_CFI_CLANG workarounds [RFC,v3,17/20] x86/tools/relocs: Ignore __kcfi_typeid_ relocations [RFC,v3,18/20] x86: Add types to indirectly called assembly functions [RFC,v3,19/20] x86/purgatory: Disable CFI [RFC,v3,20/20] x86: Add support for CONFIG_CFI_CLANG

Message ID

20220610233513.1798771-20-samitolvanen@google.com (mailing list archive)

State

Changes Requested

Headers

Date: Fri, 10 Jun 2022 16:35:12 -0700
In-Reply-To: <20220610233513.1798771-1-samitolvanen@google.com>
Message-Id: <20220610233513.1798771-20-samitolvanen@google.com>
Mime-Version: 1.0
References: <20220610233513.1798771-1-samitolvanen@google.com>
Subject: [RFC PATCH v3 19/20] x86/purgatory: Disable CFI
From: Sami Tolvanen <samitolvanen@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>, x86@kernel.org,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Joao Moreira <joao@overdrivepizza.com>,
        Sedat Dilek <sedat.dilek@gmail.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        linux-hardening@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev,
        Sami Tolvanen <samitolvanen@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

KCFI support | expand

Commit Message

Sami Tolvanen June 10, 2022, 11:35 p.m. UTC

Disable CONFIG_CFI_CLANG for the stand-alone purgatory.ro.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 arch/x86/purgatory/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index ae53d54d7959..b3fa947fa38b 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -55,6 +55,10 @@  ifdef CONFIG_RETPOLINE
 PURGATORY_CFLAGS_REMOVE		+= $(RETPOLINE_CFLAGS)
 endif
 
+ifdef CONFIG_CFI_CLANG
+PURGATORY_CFLAGS_REMOVE		+= $(CC_FLAGS_CFI)
+endif
+
 CFLAGS_REMOVE_purgatory.o	+= $(PURGATORY_CFLAGS_REMOVE)
 CFLAGS_purgatory.o		+= $(PURGATORY_CFLAGS)

[RFC,v3,19/20] x86/purgatory: Disable CFI

Commit Message

Patch