2024-02-12 11:25:08

by Arnd Bergmann

Subject: [PATCH] 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")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/firmware/efi/capsule-loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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);
--
2.39.2

2024-02-13 15:31:20

by Ard Biesheuvel

Subject: Re: [PATCH] efi/capsule-loader: fix incorrect allocation size

On Mon, 12 Feb 2024 at 12:25, Arnd Bergmann <[email protected]> wrote:
>
> 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")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/firmware/efi/capsule-loader.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);

Thanks, queued as a fix.