summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2020-10-02 10:38:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-01 12:47:03 +0100
commit0baaa4a41f34ac057b714631d729ee63e0b46ad1 (patch)
tree47fb699b68b7ea4f9804f3e76ab34c9e861ec035 /include/linux
parent5a91009aa24960736549df3eafc915152359cdbb (diff)
downloadlinux-stable-0baaa4a41f34ac057b714631d729ee63e0b46ad1.tar.gz
linux-stable-0baaa4a41f34ac057b714631d729ee63e0b46ad1.tar.bz2
linux-stable-0baaa4a41f34ac057b714631d729ee63e0b46ad1.zip
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7519ae003a08..7d4d04c9d3e6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2862,7 +2862,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) \