Commit 256b92af authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/build: Disable CET instrumentation in the kernel for 32-bit too 



Commit

  20bf2b37 ("x86/build: Disable CET instrumentation in the kernel")

disabled CET instrumentation which gets added by default by the Ubuntu
gcc9 and 10 by default, but did that only for 64-bit builds. It would
still fail when building a 32-bit target. So disable CET for all x86
builds.

Fixes: 20bf2b37 ("x86/build: Disable CET instrumentation in the kernel")
Reported-by: default avatarAC <achirvasub@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Tested-by: default avatarAC <achirvasub@gmail.com>
Link: https://lkml.kernel.org/r/YCCIgMHkzh/xT4ex@arch-chirva.localdomain
parent 2ade0d60

arch/x86/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ export BITS 
KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow

KBUILD_CFLAGS += $(call cc-option,-mno-avx,)



# Intel CET isn't enabled in the kernel

KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)



ifeq ($(CONFIG_X86_32),y)

        BITS := 32

        UTS_MACHINE := i386
@@ -120,9 +123,6 @@ else 


        KBUILD_CFLAGS += -mno-red-zone

        KBUILD_CFLAGS += -mcmodel=kernel



	# Intel CET isn't enabled in the kernel

	KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)

endif



ifdef CONFIG_X86_X32