fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum

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>

diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c
index 685edb7dd05a7bcb2ba47d2f744c8ac2e102f29d..6958ab1a80593357308009c89a738c7dd061c2d5 100644 (file)
--- 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_priv *fw_priv, u32 opt_flags)
        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;
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ac1e89872db4f3a475eadcb080060b3fd48672a4..819245cc9dbd4cef4192d097d50757bf571b914c 100644 (file)
--- 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)    \