Commit 76261fc7 authored by Kees Cook's avatar Kees Cook
Browse files

stackleak: Split KSTACK_ERASE_CFLAGS from GCC_PLUGINS_CFLAGS 

In preparation for Clang stack depth tracking for KSTACK_ERASE,
split the stackleak-specific cflags out of GCC_PLUGINS_CFLAGS into
KSTACK_ERASE_CFLAGS.

Link: https://lore.kernel.org/r/20250717232519.2984886-3-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 9ea1e8d2

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13094,6 +13094,8 @@ F: kernel/kstack_erase.c 
F:	lib/tests/randstruct_kunit.c

F:	lib/tests/usercopy_kunit.c

F:	mm/usercopy.c

F:	scripts/Makefile.kstack_erase

F:	scripts/Makefile.randstruct

F:	security/Kconfig.hardening

K:	\b(add|choose)_random_kstack_offset\b

K:	\b__check_(object_size|heap_object)\b

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1086,6 +1086,7 @@ include-$(CONFIG_KMSAN) += scripts/Makefile.kmsan 
include-$(CONFIG_UBSAN)		+= scripts/Makefile.ubsan

include-$(CONFIG_KCOV)		+= scripts/Makefile.kcov

include-$(CONFIG_RANDSTRUCT)	+= scripts/Makefile.randstruct

include-$(CONFIG_KSTACK_ERASE)	+= scripts/Makefile.kstack_erase

include-$(CONFIG_AUTOFDO_CLANG)	+= scripts/Makefile.autofdo

include-$(CONFIG_PROPELLER_CLANG)	+= scripts/Makefile.propeller

include-$(CONFIG_GCC_PLUGINS)	+= scripts/Makefile.gcc-plugins

arch/arm/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,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 $(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS)

CFLAGS_REMOVE_vgettimeofday.o = -pg -Os $(RANDSTRUCT_CFLAGS) $(KSTACK_ERASE_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
@@ -36,7 +36,8 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO 
# -Wmissing-prototypes and -Wmissing-declarations are removed from

# the CFLAGS to make possible to build the kernel with CONFIG_WERROR enabled.

CC_FLAGS_REMOVE_VDSO := $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) \

			$(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) \

			$(RANDSTRUCT_CFLAGS) $(KSTACK_ERASE_CFLAGS) \

			$(GCC_PLUGINS_CFLAGS) \

			$(CC_FLAGS_LTO) $(CC_FLAGS_CFI) \

			-Wmissing-prototypes -Wmissing-declarations

arch/sparc/vdso/Makefile

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


SPARC_REG_CFLAGS = -ffixed-g4 -ffixed-g5 $(call cc-option,-fcall-used-g5) $(call cc-option,-fcall-used-g7)



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

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



#

# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
@@ -79,6 +79,7 @@ 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 $(KSTACK_ERASE_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