Commit a4b7a12c authored Sep 08, 2022 by Sami Tolvanen Committed by Kees Cook Sep 26, 2022

x86/purgatory: Disable CFI



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>
Tested-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220908215504.3686827-22-samitolvanen@google.com

parent ccace936

arch/x86/purgatory/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)