lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 094/351] s390: disable SSP when needed
    Date
    From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

    [ Upstream commit 42e8d652438f5ddf04e5dac299cb5e623d113dc0 ]

    Though -nostdlib is passed in PURGATORY_LDFLAGS and -ffreestanding in
    KBUILD_CFLAGS_DECOMPRESSOR, -fno-stack-protector must also be passed to
    avoid linking errors related to undefined references to
    '__stack_chk_guard' and '__stack_chk_fail' if toolchain enforces
    -fstack-protector.

    Fixes
    - https://gitlab.com/kubu93/buildroot/-/jobs/1247043361

    Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
    Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
    Tested-by: Alexander Egorenkov <egorenar@linux.ibm.com>
    Link: https://lore.kernel.org/r/20210510053133.1220167-1-fontaine.fabrice@gmail.com
    Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/s390/Makefile | 1 +
    arch/s390/purgatory/Makefile | 1 +
    2 files changed, 2 insertions(+)

    diff --git a/arch/s390/Makefile b/arch/s390/Makefile
    index e443ed9947bd..098abe3a56f3 100644
    --- a/arch/s390/Makefile
    +++ b/arch/s390/Makefile
    @@ -28,6 +28,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
    KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain
    KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
    KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding
    +KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector
    KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
    KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
    KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
    diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
    index c57f8c40e992..21c4ebe29b9a 100644
    --- a/arch/s390/purgatory/Makefile
    +++ b/arch/s390/purgatory/Makefile
    @@ -24,6 +24,7 @@ KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes
    KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare
    KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
    KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
    +KBUILD_CFLAGS += -fno-stack-protector
    KBUILD_CFLAGS += $(CLANG_FLAGS)
    KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
    KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:40    [W:4.213 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site