lkml.org 
[lkml]   [2020]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 002/125] arm64: link with -z norelro regardless of CONFIG_RELOCATABLE
    Date
    From: Nick Desaulniers <ndesaulniers@google.com>

    commit 3b92fa7485eba16b05166fddf38ab42f2ff6ab95 upstream.

    With CONFIG_EXPERT=y, CONFIG_KASAN=y, CONFIG_RANDOMIZE_BASE=n,
    CONFIG_RELOCATABLE=n, we observe the following failure when trying to
    link the kernel image with LD=ld.lld:

    error: section: .exit.data is not contiguous with other relro sections

    ld.lld defaults to -z relro while ld.bfd defaults to -z norelro. This
    was previously fixed, but only for CONFIG_RELOCATABLE=y.

    Fixes: 3bbd3db86470 ("arm64: relocatable: fix inconsistencies in linker script and options")
    Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20201016175339.2429280-1-ndesaulniers@google.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm64/Makefile | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/arm64/Makefile
    +++ b/arch/arm64/Makefile
    @@ -10,7 +10,7 @@
    #
    # Copyright (C) 1995-2001 by Russell King

    -LDFLAGS_vmlinux :=--no-undefined -X
    +LDFLAGS_vmlinux :=--no-undefined -X -z norelro
    CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
    GZFLAGS :=-9

    @@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y)
    # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
    # for relative relocs, since this leads to better Image compression
    # with the relocation offsets always being zero.
    -LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \
    +LDFLAGS_vmlinux += -shared -Bsymbolic -z notext \
    $(call ld-option, --no-apply-dynamic-relocs)
    endif


    \
     
     \ /
      Last update: 2020-11-03 22:10    [W:3.993 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site