From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from conssluserg-01.nifty.com ([210.131.2.80]:25626 "EHLO conssluserg-01.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752229AbdJDOek (ORCPT ); Wed, 4 Oct 2017 10:34:40 -0400 MIME-Version: 1.0 In-Reply-To: <1506972007-80614-3-git-send-email-keescook@chromium.org> References: <1506972007-80614-1-git-send-email-keescook@chromium.org> <1506972007-80614-3-git-send-email-keescook@chromium.org> From: Masahiro Yamada Date: Wed, 4 Oct 2017 23:33:38 +0900 Message-ID: Subject: Re: [PATCH 2/3] Makefile: Move stackprotector availability out of Kconfig Content-Type: text/plain; charset="UTF-8" Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: Kees Cook Cc: Andrew Morton , Michal Marek , Ingo Molnar , Laura Abbott , Nicholas Piggin , Al Viro , Linux Kbuild mailing list , Yoshinori Sato , Rich Felker , "David S. Miller" , Linux Kernel Mailing List , linux-sh@vger.kernel.org, kernel-hardening@lists.openwall.com, Mark Rutland Hi Kees, 2017-10-03 4:20 GMT+09:00 Kees Cook : > Various portions of the kernel, especially per-architecture pieces, > need to know if the compiler is building it with the stack protector. > This was done in the arch/Kconfig with 'select', but this doesn't > allow a way to do auto-detected compiler support. In preparation for > creating an on-if-available default, move the logic for the definition of > CONFIG_CC_STACKPROTECTOR into the Makefile. > > Cc: Masahiro Yamada > Cc: Michal Marek > Cc: Andrew Morton > Cc: Ingo Molnar > Cc: Laura Abbott > Cc: Nicholas Piggin > Cc: Al Viro > Cc: linux-kbuild@vger.kernel.org > Signed-off-by: Kees Cook > --- > Makefile | 7 +++++-- > arch/Kconfig | 8 -------- > 2 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/Makefile b/Makefile > index d1119941261c..e122a9cf0399 100644 > --- a/Makefile > +++ b/Makefile > @@ -688,8 +688,11 @@ else > stackp-flag := $(call cc-option, -fno-stack-protector) > endif > endif > -# Find arch-specific stack protector compiler sanity-checking script. > -ifdef CONFIG_CC_STACKPROTECTOR > +ifdef stackp-name > + # If the stack protector has been selected, inform the rest of the build. > + 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 I have not tested this series, but I think this commit is bad (with the follow-up patch applied). I thought of this scenario: [1] Kernel is configured with CONFIG_CC_STACKPROTECTOR_AUTO [2] Kernel is built with a compiler without stack protector support. [3] CONFIG_CC_STACKPROTECTOR is not defined, so __stack_chk_fail() is not compiled. [4] Out-of-tree modules are compiled with a compiler with stack protector support. __stack_chk_fail() is inserted to functions of the modules. [5] insmod fails because reference to __stack_chk_fail() can not be resolved. I think "select CC_STACKPROTECTOR" should be kept in Kconfig. -- Best Regards Masahiro Yamada