Received-SPF: pass (google.com: domain of linux-kernel+bounces-63805-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240212112454.1213449-1-arnd@kernel.org>
In-Reply-To: <20240212112454.1213449-1-arnd@kernel.org>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 13 Feb 2024 16:30:58 +0100
Message-ID: <CAMj1kXEVJai4NF3P4kpVPNrSLv5ui5ayEpq05WWk=-hPEBHb+g@mail.gmail.com>
Subject: Re: [PATCH] efi/capsule-loader: fix incorrect allocation size
To: Arnd Bergmann <arnd@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>, Arnd Bergmann <arnd@arndb.de>, linux-efi@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"

On Mon, 12 Feb 2024 at 12:25, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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>
> ---
>  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.