Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

First batch of EFI fixes for v6.13

Browse Source 
- Limit EFI zboot to GZIP and ZSTD before it comes in wider use
 
 - Fix inconsistent error when looking up a non-existent file in efivarfs
   with a name that does not adhere to the NAME-GUID format
 
 - Drop some unused code
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQQm/3uucuRGn1Dmh0wbglWLn0tXAUCZ17ajwAKCRAwbglWLn0t
 XGkQAQCuIi5yPony5hJf6vrYXm7rnHN2NS9Wg7q3rKNR7TIGMQD/YHRdNJbJ4nO5
 BrOVS4eVXvSzvWrYxB/W4EAMJ1uyLgs=
 =LNFy
 -----END PGP SIGNATURE-----

Merge tag 'efi-fixes-for-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel:

 - Limit EFI zboot to GZIP and ZSTD before it comes in wider use

 - Fix inconsistent error when looking up a non-existent file in
   efivarfs with a name that does not adhere to the NAME-GUID format

 - Drop some unused code

* tag 'efi-fixes-for-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/esrt: remove esre_attribute::store()
  efivarfs: Fix error on non-existent file
  efi/zboot: Limit compression options to GZIP and ZSTD
This commit is contained in:
Linus Torvalds 2024-12-15 15:33:41 -08:00
commit 7031a38ab7
6 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/efi/Kconfig
View File

@ -76,10 +76,6 @@ config EFI_ZBOOT
bool "Enable the generic EFI decompressor" bool "Enable the generic EFI decompressor"
depends on EFI_GENERIC_STUB && !ARM depends on EFI_GENERIC_STUB && !ARM
select HAVE_KERNEL_GZIP select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZ4
select HAVE_KERNEL_LZMA
select HAVE_KERNEL_LZO
select HAVE_KERNEL_XZ
select HAVE_KERNEL_ZSTD select HAVE_KERNEL_ZSTD
help help
Create the bootable image as an EFI application that carries the Create the bootable image as an EFI application that carries the

2
drivers/firmware/efi/esrt.c
View File

@ -75,8 +75,6 @@ static LIST_HEAD(entry_list);
struct esre_attribute { struct esre_attribute {
struct attribute attr; struct attribute attr;
ssize_t (*show)(struct esre_entry *entry, char *buf); ssize_t (*show)(struct esre_entry *entry, char *buf);
ssize_t (*store)(struct esre_entry *entry,
const char *buf, size_t count);
}; };
static struct esre_entry *to_entry(struct kobject *kobj) static struct esre_entry *to_entry(struct kobject *kobj)

18
drivers/firmware/efi/libstub/Makefile.zboot
View File

@ -12,22 +12,16 @@ quiet_cmd_copy_and_pad = PAD $@
$(obj)/vmlinux.bin: $(obj)/$(EFI_ZBOOT_PAYLOAD) FORCE $(obj)/vmlinux.bin: $(obj)/$(EFI_ZBOOT_PAYLOAD) FORCE
$(call if_changed,copy_and_pad) $(call if_changed,copy_and_pad)
comp-type-$(CONFIG_KERNEL_GZIP) := gzip
comp-type-$(CONFIG_KERNEL_LZ4) := lz4
comp-type-$(CONFIG_KERNEL_LZMA) := lzma
comp-type-$(CONFIG_KERNEL_LZO) := lzo
comp-type-$(CONFIG_KERNEL_XZ) := xzkern
comp-type-$(CONFIG_KERNEL_ZSTD) := zstd22
# in GZIP, the appended le32 carrying the uncompressed size is part of the # in GZIP, the appended le32 carrying the uncompressed size is part of the
# format, but in other cases, we just append it at the end for convenience, # format, but in other cases, we just append it at the end for convenience,
# causing the original tools to complain when checking image integrity. # causing the original tools to complain when checking image integrity.
# So disregard it when calculating the payload size in the zimage header. comp-type-y := gzip
zboot-method-y := $(comp-type-y)_with_size zboot-method-y := gzip
zboot-size-len-y := 4 zboot-size-len-y := 0
zboot-method-$(CONFIG_KERNEL_GZIP) := gzip comp-type-$(CONFIG_KERNEL_ZSTD) := zstd
zboot-size-len-$(CONFIG_KERNEL_GZIP) := 0 zboot-method-$(CONFIG_KERNEL_ZSTD) := zstd22_with_size
zboot-size-len-$(CONFIG_KERNEL_ZSTD) := 4
$(obj)/vmlinuz: $(obj)/vmlinux.bin FORCE $(obj)/vmlinuz: $(obj)/vmlinux.bin FORCE
$(call if_changed,$(zboot-method-y)) $(call if_changed,$(zboot-method-y))

2
fs/efivarfs/inode.c
View File

@ -51,7 +51,7 @@ struct inode *efivarfs_get_inode(struct super_block *sb,
* *
* VariableName-12345678-1234-1234-1234-1234567891bc * VariableName-12345678-1234-1234-1234-1234567891bc
*/ */
bool efivarfs_valid_name(const char *str, int len) static bool efivarfs_valid_name(const char *str, int len)
{ {
const char *s = str + len - EFI_VARIABLE_GUID_LEN; const char *s = str + len - EFI_VARIABLE_GUID_LEN;

1
fs/efivarfs/internal.h
View File

@ -60,7 +60,6 @@ bool efivar_variable_is_removable(efi_guid_t vendor, const char *name,
extern const struct file_operations efivarfs_file_operations; extern const struct file_operations efivarfs_file_operations;
extern const struct inode_operations efivarfs_dir_inode_operations; extern const struct inode_operations efivarfs_dir_inode_operations;
extern bool efivarfs_valid_name(const char *str, int len);
extern struct inode *efivarfs_get_inode(struct super_block *sb, extern struct inode *efivarfs_get_inode(struct super_block *sb,
const struct inode *dir, int mode, dev_t dev, const struct inode *dir, int mode, dev_t dev,
bool is_removable); bool is_removable);

3
fs/efivarfs/super.c
View File

@ -144,9 +144,6 @@ static int efivarfs_d_hash(const struct dentry *dentry, struct qstr *qstr)
const unsigned char *s = qstr->name; const unsigned char *s = qstr->name;
unsigned int len = qstr->len; unsigned int len = qstr->len;
if (!efivarfs_valid_name(s, len))
return -EINVAL;
while (len-- > EFI_VARIABLE_GUID_LEN) while (len-- > EFI_VARIABLE_GUID_LEN)
hash = partial_name_hash(*s++, hash); hash = partial_name_hash(*s++, hash);