# git rev-parse -q --verify 050e9baa9dc9fbd9ce2b27f0056990fc9e0a08a0^{commit} 050e9baa9dc9fbd9ce2b27f0056990fc9e0a08a0 already have revision, skipping fetch # git checkout -q -f -B kisskb 050e9baa9dc9fbd9ce2b27f0056990fc9e0a08a0 # git clean -qxdf # < git log -1 # commit 050e9baa9dc9fbd9ce2b27f0056990fc9e0a08a0 # Author: Linus Torvalds # Date: Thu Jun 14 12:21:18 2018 +0900 # # Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables # # The changes to automatically test for working stack protector compiler # support in the Kconfig files removed the special STACKPROTECTOR_AUTO # option that picked the strongest stack protector that the compiler # supported. # # That was all a nice cleanup - it makes no sense to have the AUTO case # now that the Kconfig phase can just determine the compiler support # directly. # # HOWEVER. # # It also meant that doing "make oldconfig" would now _disable_ the strong # stackprotector if you had AUTO enabled, because in a legacy config file, # the sane stack protector configuration would look like # # CONFIG_HAVE_CC_STACKPROTECTOR=y # # CONFIG_CC_STACKPROTECTOR_NONE is not set # # CONFIG_CC_STACKPROTECTOR_REGULAR is not set # # CONFIG_CC_STACKPROTECTOR_STRONG is not set # CONFIG_CC_STACKPROTECTOR_AUTO=y # # and when you ran this through "make oldconfig" with the Kbuild changes, # it would ask you about the regular CONFIG_CC_STACKPROTECTOR (that had # been renamed from CONFIG_CC_STACKPROTECTOR_REGULAR to just # CONFIG_CC_STACKPROTECTOR), but it would think that the STRONG version # used to be disabled (because it was really enabled by AUTO), and would # disable it in the new config, resulting in: # # CONFIG_HAVE_CC_STACKPROTECTOR=y # CONFIG_CC_HAS_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR=y # # CONFIG_CC_STACKPROTECTOR_STRONG is not set # CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # # That's dangerously subtle - people could suddenly find themselves with # the weaker stack protector setup without even realizing. # # The solution here is to just rename not just the old RECULAR stack # protector option, but also the strong one. This does that by just # removing the CC_ prefix entirely for the user choices, because it really # is not about the compiler support (the compiler support now instead # automatially impacts _visibility_ of the options to users). # # This results in "make oldconfig" actually asking the user for their # choice, so that we don't have any silent subtle security model changes. # The end result would generally look like this: # # CONFIG_HAVE_CC_STACKPROTECTOR=y # CONFIG_CC_HAS_STACKPROTECTOR_NONE=y # CONFIG_STACKPROTECTOR=y # CONFIG_STACKPROTECTOR_STRONG=y # CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # # where the "CC_" versions really are about internal compiler # infrastructure, not the user selections. # # Acked-by: Masahiro Yamada # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < git log --format=%s --max-count=1 050e9baa9dc9fbd9ce2b27f0056990fc9e0a08a0 # < make -s -j 10 ARCH=um O=/kisskb/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 defconfig # make -s -j 10 ARCH=um O=/kisskb/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/skas/process.c: In function 'start_idle_thread': /kisskb/src/arch/um/os-Linux/skas/process.c:613:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ /kisskb/src/net/core/rtnetlink.c: In function 'rtnl_newlink': /kisskb/src/net/core/rtnetlink.c:3099:1: warning: the frame size of 1280 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ LINK linux Completed OK # rm -rf /kisskb/build/linus_um-defconfig_um-x86_64 # Build took: 0:01:18.272124