Received-SPF: pass (google.com: domain of linux-kernel+bounces-162610-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240423135928.1200-1-hagarhem@amazon.com>
In-Reply-To: <20240423135928.1200-1-hagarhem@amazon.com>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Mon, 29 Apr 2024 17:48:05 +0200
Message-ID: <CAMj1kXHiPcgC7-kXToivcbfyHe9g3Cg6__TFWhHYRUcOJ8hy1g@mail.gmail.com>
Subject: Re: [PATCH v2] efi: libstub: only free priv.runtime_map when allocated
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
Content-Type: text/plain; charset="UTF-8"

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
>