lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 52/67] x86/boot/64: Verify alignment of the LOAD segment
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: H.J. Lu <hjl.tools@gmail.com>

    commit c55b8550fa57ba4f5e507be406ff9fc2845713e8 upstream.

    Since the x86-64 kernel must be aligned to 2MB, refuse to boot the
    kernel if the alignment of the LOAD segment isn't a multiple of 2MB.

    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
    Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
    Cc: Eric Biederman <ebiederm@xmission.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Juergen Gross <jgross@suse.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/CAMe9rOrR7xSJgUfiCoZLuqWUwymRxXPoGBW38%2BpN%3D9g%2ByKNhZw@mail.gmail.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/boot/compressed/misc.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/arch/x86/boot/compressed/misc.c
    +++ b/arch/x86/boot/compressed/misc.c
    @@ -299,6 +299,10 @@ static void parse_elf(void *output)

    switch (phdr->p_type) {
    case PT_LOAD:
    +#ifdef CONFIG_X86_64
    + if ((phdr->p_align % 0x200000) != 0)
    + error("Alignment of LOAD segment isn't multiple of 2MB");
    +#endif
    #ifdef CONFIG_RELOCATABLE
    dest = output;
    dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);

    \
     
     \ /
      Last update: 2018-03-27 19:49    [W:3.821 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site