Skip to contentSkip to conversation

efi: libstub: only free priv.runtime_map when allocated

PATCH Applied Hagar Hemdan 2 participants 2 messages Apr 23, 2024 – Apr 29, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 efi: libstub: only free priv.runtime_map when allocated

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")

---
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(-)
drivers/firmware/efi/libstub/fdt.c +2 -2
index 70e9789ff9de..6a337f1f8787 100644
@@ -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;
 }
Signature · 1 line
2.40.1
maintainer Applied
#1 lore raw
Quoted 13 lines · Hagar Hemdan

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")
Quoted 7 lines

---
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.

Quoted 18 lines
drivers/firmware/efi/libstub/fdt.c +2 -3
index 70e9789ff9de..6a337f1f8787 100644
@@ -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