lkml.org 
[lkml]   [2015]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 043/135] x86, boot: Skip relocs when load address unchanged
    Date
    3.16.7-ckt6 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    commit f285f4a21c3253887caceed493089ece17579d59 upstream.

    On 64-bit, relocation is not required unless the load address gets
    changed. Without this, relocations do unexpected things when the kernel
    is above 4G.

    Reported-by: Baoquan He <bhe@redhat.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Tested-by: Thomas D. <whissi@whissi.de>
    Cc: Vivek Goyal <vgoyal@redhat.com>
    Cc: Jan Beulich <JBeulich@suse.com>
    Cc: Junjie Mao <eternal.n08@gmail.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Link: http://lkml.kernel.org/r/20150116005146.GA4212@www.outflux.net
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/x86/boot/compressed/misc.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
    index 30dd59a9f0b4..0c33a7c67ea5 100644
    --- a/arch/x86/boot/compressed/misc.c
    +++ b/arch/x86/boot/compressed/misc.c
    @@ -361,6 +361,8 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
    unsigned long output_len,
    unsigned long run_size)
    {
    + unsigned char *output_orig = output;
    +
    real_mode = rmode;

    sanitize_boot_params(real_mode);
    @@ -409,7 +411,12 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
    debug_putstr("\nDecompressing Linux... ");
    decompress(input_data, input_len, NULL, NULL, output, NULL, error);
    parse_elf(output);
    - handle_relocations(output, output_len);
    + /*
    + * 32-bit always performs relocations. 64-bit relocations are only
    + * needed if kASLR has chosen a different load address.
    + */
    + if (!IS_ENABLED(CONFIG_X86_64) || output != output_orig)
    + handle_relocations(output, output_len);
    debug_putstr("done.\nBooting the kernel.\n");
    return output;
    }
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-02-06 13:41    [W:4.854 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site