diff options
| author | Hagar Hemdan <hagarhem@amazon.com> | 2024-04-23 13:59:26 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2024-04-29 17:47:32 +0200 |
| commit | 4b2543f7e1e6b91cfc8dd1696e3cdf01c3ac8974 (patch) | |
| tree | e29b2734320e8c004c16072a8065c1ede1a49868 | |
| parent | cda30c6542c8bb445bc84f6616cac8d012547f0a (diff) | |
| download | efi-4b2543f7e1e6b91cfc8dd1696e3cdf01c3ac8974.tar.gz | |
efi: libstub: only free priv.runtime_map when allocatedefi-next-for-v6.10
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>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
| -rw-r--r-- | drivers/firmware/efi/libstub/fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 70e9789ff9de0..6a337f1f8787b 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -335,8 +335,8 @@ fail_free_new_fdt: 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; } |