From: Ard Biesheuvel <ardb@kernel.org>
To: Hagar Hemdan <hagarhem@amazon.com>
Cc: Maximilian Heyne <mheyne@amazon.de>,
Pratyush Yadav <ptyadav@amazon.de>,
Norbert Manthey <nmanthey@amazon.de>,
stable@vger.kernel.org, linux-efi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] efi: libstub: only free priv.runtime_map when allocated
Date: Mon, 29 Apr 2024 17:48:05 +0200 [thread overview]
Message-ID: <CAMj1kXHiPcgC7-kXToivcbfyHe9g3Cg6__TFWhHYRUcOJ8hy1g@mail.gmail.com> (raw)
In-Reply-To: <20240423135928.1200-1-hagarhem@amazon.com>
On Tue, 23 Apr 2024 at 16:00, Hagar Hemdan <hagarhem@amazon.com> wrote:
>
> priv.runtime_map is only allocated when efi_novamap is not set.
> Otherwise, it is an uninitialized value.
> In the error path, it is freed unconditionally.
> Avoid passing an uninitialized value to free_pool.
> Free priv.runtime_map only when it was allocated.
>
> This bug was discovered and resolved using Coverity Static Analysis
> Security Testing (SAST) by Synopsys, Inc.
>
> Fixes: f80d26043af9 ("efi: libstub: avoid efi_get_memory_map() for allocating the virt map")
> Cc: stable@vger.kernel.org
> Signed-off-by: Hagar Hemdan <hagarhem@amazon.com>
> ---
> v2: added Cc stable tag to the commit message as requested by kernel
> test robot.
> ---
> drivers/firmware/efi/libstub/fdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Queued up in efi/next, thanks.
> diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
> index 70e9789ff9de..6a337f1f8787 100644
> --- a/drivers/firmware/efi/libstub/fdt.c
> +++ b/drivers/firmware/efi/libstub/fdt.c
> @@ -335,8 +335,8 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
>
> fail:
> efi_free(fdt_size, fdt_addr);
> -
> - efi_bs_call(free_pool, priv.runtime_map);
> + if (!efi_novamap)
> + efi_bs_call(free_pool, priv.runtime_map);
>
> return EFI_LOAD_ERROR;
> }
> --
> 2.40.1
>
prev parent reply other threads:[~2024-04-29 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 13:59 [PATCH v2] efi: libstub: only free priv.runtime_map when allocated Hagar Hemdan
2024-04-29 15:48 ` 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=CAMj1kXHiPcgC7-kXToivcbfyHe9g3Cg6__TFWhHYRUcOJ8hy1g@mail.gmail.com \
--to=ardb@kernel.org \
--cc=hagarhem@amazon.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mheyne@amazon.de \
--cc=nmanthey@amazon.de \
--cc=ptyadav@amazon.de \
--cc=stable@vger.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 NNTP newsgroup(s).