summaryrefslogtreecommitdiff
path: root/drivers/firmware
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-03-01 11:40:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2024-03-01 11:40:29 -0800
commit2bbb54ba1bf73d0f7db0d218731db721199e0db0 (patch)
tree6105c934604f253e264f15c707202c94ca16592a /drivers/firmware
parentfbf9e3b6978bbd350f2a4c81e112431610dd065c (diff)
parent2ce507f57ba9c78c080d4a050ebdc97263239de8 (diff)
downloadlwn-2bbb54ba1bf73d0f7db0d218731db721199e0db0.tar.gz
lwn-2bbb54ba1bf73d0f7db0d218731db721199e0db0.zip
Merge tag 'efi-fixes-for-v6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel: "Only the EFI variable name size change is significant, and will be backported once it lands. The others are cleanup. - Fix phys_addr_t size confusion in 32-bit capsule loader - Reduce maximum EFI variable name size to 512 to work around buggy firmware - Drop some redundant code from efivarfs while at it" * tag 'efi-fixes-for-v6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efivarfs: Drop 'duplicates' bool parameter on efivar_init() efivarfs: Drop redundant cleanup on fill_super() failure efivarfs: Request at most 512 bytes for variable names efi/capsule-loader: fix incorrect allocation size
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/efi/capsule-loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index 3e8d4b51a814..97bafb5f7038 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -292,7 +292,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
return -ENOMEM;
}
- cap_info->phys = kzalloc(sizeof(void *), GFP_KERNEL);
+ cap_info->phys = kzalloc(sizeof(phys_addr_t), GFP_KERNEL);
if (!cap_info->phys) {
kfree(cap_info->pages);
kfree(cap_info);