Skip to contentSkip to conversation

efi/capsule-loader: fix incorrect allocation size

PATCH In review Arnd Bergmann 2 participants 2 messages Feb 12, 2024 – Feb 13, 2024 EFI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi/capsule-loader: fix incorrect allocation size

From: Arnd Bergmann <[email protected]>

gcc-14 notices that the allocation with sizeof(void) on 32-bit architectures is not enough for a 64-bit phys_addr_t:

drivers/firmware/efi/capsule-loader.c: In function 'efi_capsule_open':
drivers/firmware/efi/capsule-loader.c:295:24: error: allocation of insufficient size '4' for type 'phys_addr_t' {aka 'long long unsigned int'} with size '8' [-Werror=alloc-size]
295 | cap_info->phys = kzalloc(sizeof(void *), GFP_KERNEL);
| ^

Use the correct type instead here.

Fixes f24c4d478013 ("efi/capsule-loader: Reinstate virtual capsule mapping")
---
 drivers/firmware/efi/capsule-loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/capsule-loader.c +1 -1
index 3e8d4b51a814..97bafb5f7038 100644
@@ -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);
Signature · 1 line
2.39.2
maintainer
#1 lore raw
Quoted 24 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

gcc-14 notices that the allocation with sizeof(void) on 32-bit architectures is not enough for a 64-bit phys_addr_t:

drivers/firmware/efi/capsule-loader.c: In function 'efi_capsule_open':
drivers/firmware/efi/capsule-loader.c:295:24: error: allocation of insufficient size '4' for type 'phys_addr_t' {aka 'long long unsigned int'} with size '8' [-Werror=alloc-size]
295 | cap_info->phys = kzalloc(sizeof(void *), GFP_KERNEL);
| ^

Use the correct type instead here.

Fixes f24c4d478013 ("efi/capsule-loader: Reinstate virtual capsule mapping")
---
 drivers/firmware/efi/capsule-loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/capsule-loader.c +0 -0
index 3e8d4b51a814..97bafb5f7038 100644

drivers/firmware/efi/capsule-loader.c static int efi_capsule_open(struct inode *inode, struct file *file) · line 298

Quoted 8 lines
drivers/firmware/efi/capsule-loader.c +1 -1
@@ -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);

Thanks, queued as a fix.