lkml.org 
[lkml]   [2019]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 36/83] x86/boot: Fix boot regression caused by bootparam sanitizing
    Date
    From: John Hubbard <jhubbard@nvidia.com>

    commit 7846f58fba964af7cb8cf77d4d13c33254725211 upstream.

    commit a90118c445cc ("x86/boot: Save fields explicitly, zero out everything
    else") had two errors:

    * It preserved boot_params.acpi_rsdp_addr, and
    * It failed to preserve boot_params.hdr

    Therefore, zero out acpi_rsdp_addr, and preserve hdr.

    Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else")
    Reported-by: Neil MacLeod <neil@nmacleod.com>
    Suggested-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: John Hubbard <jhubbard@nvidia.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Neil MacLeod <neil@nmacleod.com>
    Cc: stable@vger.kernel.org
    Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/asm/bootparam_utils.h | 1 +
    1 file changed, 1 insertion(+)

    --- a/arch/x86/include/asm/bootparam_utils.h
    +++ b/arch/x86/include/asm/bootparam_utils.h
    @@ -70,6 +70,7 @@ static void sanitize_boot_params(struct
    BOOT_PARAM_PRESERVE(eddbuf_entries),
    BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
    BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
    + BOOT_PARAM_PRESERVE(hdr),
    BOOT_PARAM_PRESERVE(eddbuf),
    };


    \
     
     \ /
      Last update: 2019-09-04 20:24    [W:4.167 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site