From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752573AbdKGRi6 (ORCPT ); Tue, 7 Nov 2017 12:38:58 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:43133 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbdKGRiz (ORCPT ); Tue, 7 Nov 2017 12:38:55 -0500 X-Google-Smtp-Source: ABhQp+TM4CykPwvesOJ6CvuHBijI8MLW+xirncWyG5ywP5Rs/6PuDVVi0hDGJ/AdLo57P+93TJ1DcQ== From: Kees Cook To: Andrew Morton Cc: Kees Cook , Masahiro Yamada , Arnd Bergmann , linux-kbuild@vger.kernel.org, Josh Triplett , Nicholas Piggin , Laura Abbott , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] Makefile: Move stack-protector compiler breakage test earlier Date: Tue, 7 Nov 2017 09:38:38 -0800 Message-Id: <1510076320-69931-2-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510076320-69931-1-git-send-email-keescook@chromium.org> References: <1510076320-69931-1-git-send-email-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to make stack-protector failures warn instead of unconditionally breaking the build, this moves the compiler output sanity-check earlier, and sets a flag for later testing. Future patches can choose to warn or fail, depending on the flag value. Cc: Masahiro Yamada Cc: Arnd Bergmann Cc: linux-kbuild@vger.kernel.org Signed-off-by: Kees Cook --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cf007a31d575..caa3f7e6f524 100644 --- a/Makefile +++ b/Makefile @@ -692,6 +692,12 @@ endif ifdef CONFIG_CC_STACKPROTECTOR stackp-path := $(srctree)/scripts/gcc-$(SRCARCH)_$(BITS)-has-stack-protector.sh stackp-check := $(wildcard $(stackp-path)) + # If the wildcard test matches a test script, run it to check functionality. + ifdef stackp-check + ifneq ($(shell $(CONFIG_SHELL) $(stackp-check) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y) + stackp-broken := y + endif + endif endif KBUILD_CFLAGS += $(stackp-flag) @@ -1087,11 +1093,9 @@ ifdef stackp-name endif endif # Make sure compiler does not have buggy stack-protector support. -ifdef stackp-check - ifneq ($(shell $(CONFIG_SHELL) $(stackp-check) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y) +ifdef stackp-broken @echo Cannot use CONFIG_CC_STACKPROTECTOR_$(stackp-name): \ $(stackp-flag) available but compiler is broken >&2 && exit 1 - endif endif @: -- 2.7.4