Commit 613f4b3e authored May 03, 2022 by Kees Cook

randstruct: Split randstruct Makefile and CFLAGS

To enable the new Clang randstruct implementation[1], move
randstruct into its own Makefile and split the CFLAGS from
GCC_PLUGINS_CFLAGS into RANDSTRUCT_CFLAGS.

[1] https://reviews.llvm.org/D121556



Cc: linux-hardening@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220503205503.3054173-5-keescook@chromium.org

parent 595b893e

Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -1011,6 +1011,7 @@ include-$(CONFIG_KASAN) += scripts/Makefile.kasan
		include-$(CONFIG_KCSAN) += scripts/Makefile.kcsan
		include-$(CONFIG_UBSAN) += scripts/Makefile.ubsan
		include-$(CONFIG_KCOV) += scripts/Makefile.kcov
		include-$(CONFIG_RANDSTRUCT) += scripts/Makefile.randstruct
		include-$(CONFIG_GCC_PLUGINS) += scripts/Makefile.gcc-plugins

		include $(addprefix $(srctree)/, $(include-y))

arch/arm/vdso/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
		CFLAGS_REMOVE_vdso.o = -pg

		# Force -O2 to avoid libgcc dependencies
		CFLAGS_REMOVE_vgettimeofday.o = -pg -Os $(GCC_PLUGINS_CFLAGS)
		CFLAGS_REMOVE_vgettimeofday.o = -pg -Os $(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS)
		ifeq ($(c-gettimeofday-y),)
		CFLAGS_vgettimeofday.o = -O2
		else

arch/arm64/kernel/vdso/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,8 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO
		# -Wmissing-prototypes and -Wmissing-declarations are removed from
		# the CFLAGS of vgettimeofday.c to make possible to build the
		# kernel with CONFIG_WERROR enabled.
		CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) $(GCC_PLUGINS_CFLAGS) \
		CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) \
		$(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) \
		$(CC_FLAGS_LTO) -Wmissing-prototypes -Wmissing-declarations
		KASAN_SANITIZE := n
		KCSAN_SANITIZE := n

arch/sparc/vdso/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ CFL := $(PROFILING) -mcmodel=medlow -fPIC -O2 -fasynchronous-unwind-tables -m64

		SPARC_REG_CFLAGS = -ffixed-g4 -ffixed-g5 -fcall-used-g5 -fcall-used-g7

		$(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(SPARC_REG_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)
		$(vobjs): KBUILD_CFLAGS := $(filter-out $(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) $(SPARC_REG_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)

		#
		# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
		@@ -88,6 +88,7 @@ $(obj)/vdso32.so.dbg: asflags-$(CONFIG_SPARC64) += -m32
		KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
		KBUILD_CFLAGS_32 := $(filter-out -mcmodel=medlow,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out -fno-pic,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(RANDSTRUCT_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(SPARC_REG_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 += -m32 -msoft-float -fpic

arch/x86/entry/vdso/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ ifneq ($(RETPOLINE_VDSO_CFLAGS),)
		endif
		endif

		$(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)
		$(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)

		#
		# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
		@@ -148,6 +148,7 @@ KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
		KBUILD_CFLAGS_32 := $(filter-out -mcmodel=kernel,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out -fno-pic,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out -mfentry,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(RANDSTRUCT_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(CC_FLAGS_LTO),$(KBUILD_CFLAGS_32))