From: Ard Biesheuvel <ardb@kernel.org>
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
Subject: Re: [PATCH] efi/capsule-loader: fix incorrect allocation size
Date: Tue, 13 Feb 2024 16:30:58 +0100 [thread overview]
Message-ID: <CAMj1kXEVJai4NF3P4kpVPNrSLv5ui5ayEpq05WWk=-hPEBHb+g@mail.gmail.com> (raw)
In-Reply-To: <20240212112454.1213449-1-arnd@kernel.org>
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.
prev parent reply other threads:[~2024-02-13 15:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-12 11:24 [PATCH] efi/capsule-loader: fix incorrect allocation size Arnd Bergmann
2024-02-13 15:30 ` Ard Biesheuvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMj1kXEVJai4NF3P4kpVPNrSLv5ui5ayEpq05WWk=-hPEBHb+g@mail.gmail.com' \
--to=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).