lkml.org 
[lkml]   [2018]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 3/3] x86: Add build salt to the vDSO and kernel linker scripts
    Date

    Both the kernel and the vDSO need to have unique build ids.
    Insert the build salt section to make the build ids unique.

    Signed-off-by: Laura Abbott <labbott@redhat.com>
    ---
    arch/x86/entry/vdso/vdso-layout.lds.S | 3 ++-
    arch/x86/kernel/vmlinux.lds.S | 1 +
    2 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/entry/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S
    index acfd5ba7d943..a331c1d41360 100644
    --- a/arch/x86/entry/vdso/vdso-layout.lds.S
    +++ b/arch/x86/entry/vdso/vdso-layout.lds.S
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0 */
    #include <asm/vdso.h>
    -
    +#include <asm-generic/vmlinux.lds.h>
    /*
    * Linker script for vDSO. This is an ELF shared object prelinked to
    * its virtual address, and with only one read-only segment.
    @@ -74,6 +74,7 @@ SECTIONS
    .fake_shstrtab : { *(.fake_shstrtab) } :text


    + BUILD_SALT
    .note : { *(.note.*) } :text :note

    .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
    diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
    index 5e1458f609a1..b61c33fa2617 100644
    --- a/arch/x86/kernel/vmlinux.lds.S
    +++ b/arch/x86/kernel/vmlinux.lds.S
    @@ -172,6 +172,7 @@ SECTIONS
    _edata = .;
    } :data

    + BUILD_SALT
    BUG_TABLE

    ORC_UNWIND_TABLE
    --
    2.18.0.rc1
    \
     
     \ /
      Last update: 2018-06-12 02:34    [W:3.173 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site