There was a think-o in the logic for CONFIG_CC_STACKPROTECTOR_AUTO, which would leave CONFIG_CC_STACKPROTECTOR defined when a compiler didn't support stack-protector. This usually won't cause a problem with a build, but it's not correct, and shouldn't happen. Reported-by: Mark Rutland <mark.rutland@xxxxxxx> Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> Cc: linux-kbuild@xxxxxxxxxxxxxxx Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> --- Andrew, if possible, can you squash this as a fix for the mmots patch "makefile-introduce-config_cc_stackprotector_auto.patch"? If not, that's fine. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9bd334b35003..2f8ff79fa9a5 100644 --- a/Makefile +++ b/Makefile @@ -693,14 +693,18 @@ else endif endif endif +# If stack-protection was requested (and available, in the case of _AUTO), +# then prepare the build for it being enabled. ifdef stackp-name - # If the stack protector has been selected, inform the rest of the build. +ifneq ($(stackp-flag),) + # If the stack protector is active, enable code that depends on it. KBUILD_CFLAGS += -DCONFIG_CC_STACKPROTECTOR KBUILD_AFLAGS += -DCONFIG_CC_STACKPROTECTOR # Find arch-specific stack protector compiler sanity-checking script. stackp-path := $(srctree)/scripts/gcc-$(SRCARCH)_$(BITS)-has-stack-protector.sh stackp-check := $(wildcard $(stackp-path)) endif +endif KBUILD_CFLAGS += $(stackp-flag) ifeq ($(cc-name),clang) -- 2.7.4 -- Kees Cook Pixel Security -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
