[v4,20/21] x86/purgatory: Disable CFI

Message ID	20220830233129.30610-21-samitolvanen@google.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-hardening-owner@kernel.org> Date: Tue, 30 Aug 2022 16:31:28 -0700 In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> Message-Id: <20220830233129.30610-21-samitolvanen@google.com> Mime-Version: 1.0 References: <20220830233129.30610-1-samitolvanen@google.com> Subject: [PATCH v4 20/21] 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 [v4,00/21] KCFI support [v4,01/21] treewide: Filter out CC_FLAGS_CFI [v4,02/21] scripts/kallsyms: Ignore __kcfi_typeid_ [v4,03/21] cfi: Remove CONFIG_CFI_CLANG_SHADOW [v4,04/21] cfi: Drop __CFI_ADDRESSABLE [v4,05/21] cfi: Switch to -fsanitize=kcfi [v4,06/21] cfi: Add type helper macros [v4,07/21] lkdtm: Emit an indirect call for CFI tests [v4,08/21] psci: Fix the function type for psci_initcall_t [v4,09/21] arm64: Add types to indirect called assembly functions [v4,10/21] arm64: Add CFI error handling [v4,11/21] arm64: Drop unneeded __nocfi attributes [v4,12/21] init: Drop __nocfi from __init [v4,13/21] treewide: Drop function_nocfi [v4,14/21] treewide: Drop WARN_ON_FUNCTION_MISMATCH [v4,15/21] treewide: Drop __cficanonical [v4,16/21] objtool: Disable CFI warnings [v4,17/21] kallsyms: Drop CONFIG_CFI_CLANG workarounds [v4,18/21] x86/tools/relocs: Ignore __kcfi_typeid_ relocations [v4,19/21] x86: Add types to indirectly called assembly functions [v4,20/21] x86/purgatory: Disable CFI [v4,21/21] x86: Add support for CONFIG_CFI_CLANG

Message ID

20220830233129.30610-21-samitolvanen@google.com (mailing list archive)

State

Superseded

Headers

Date: Tue, 30 Aug 2022 16:31:28 -0700
In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com>
Message-Id: <20220830233129.30610-21-samitolvanen@google.com>
Mime-Version: 1.0
References: <20220830233129.30610-1-samitolvanen@google.com>
Subject: [PATCH v4 20/21] 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 Aug. 30, 2022, 11:31 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 31c634a22818..58a200dc762d 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)

[v4,20/21] x86/purgatory: Disable CFI

Commit Message

Patch