lkml.org 
[lkml]   [2020]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 19/70] fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum
    Date
    From: Kees Cook <keescook@chromium.org>

    commit 06e67b849ab910a49a629445f43edb074153d0eb upstream.

    The "FIRMWARE_EFI_EMBEDDED" enum is a "where", not a "what". It
    should not be distinguished separately from just "FIRMWARE", as this
    confuses the LSMs about what is being loaded. Additionally, there was
    no actual validation of the firmware contents happening.

    Fixes: e4c2c0ff00ec ("firmware: Add new platform fallback mechanism and firmware_request_platform()")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
    Acked-by: Scott Branden <scott.branden@broadcom.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20201002173828.2099543-3-keescook@chromium.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/base/firmware_loader/fallback_platform.c | 2 +-
    include/linux/fs.h | 1 -
    2 files changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/base/firmware_loader/fallback_platform.c
    +++ b/drivers/base/firmware_loader/fallback_platform.c
    @@ -17,7 +17,7 @@ int firmware_fallback_platform(struct fw
    if (!(opt_flags & FW_OPT_FALLBACK_PLATFORM))
    return -ENOENT;

    - rc = security_kernel_load_data(LOADING_FIRMWARE_EFI_EMBEDDED);
    + rc = security_kernel_load_data(LOADING_FIRMWARE);
    if (rc)
    return rc;

    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -3011,7 +3011,6 @@ extern int do_pipe_flags(int *, int);
    id(UNKNOWN, unknown) \
    id(FIRMWARE, firmware) \
    id(FIRMWARE_PREALLOC_BUFFER, firmware) \
    - id(FIRMWARE_EFI_EMBEDDED, firmware) \
    id(MODULE, kernel-module) \
    id(KEXEC_IMAGE, kexec-image) \
    id(KEXEC_INITRAMFS, kexec-initramfs) \

    \
     
     \ /
      Last update: 2020-10-31 12:41    [W:2.415 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site