]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
efi/capsule-loader: fix incorrect allocation size
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Feb 2024 11:24:40 +0000 (12:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Mar 2024 14:45:09 +0000 (14:45 +0000)
[ Upstream commit fccfa646ef3628097d59f7d9c1a3e84d4b6bb45e ]

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 <arnd@arndb.de>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/efi/capsule-loader.c

index 3e8d4b51a8140c16720eef8f08d311b024b1a830..97bafb5f7038924fb99eea6f5679b18b2d459e5a 100644 (file)
@@ -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);