[PATCH] efi_loader: EFI TCG2 free efi memory on protocol failure
Ilias Apalodimas
ilias.apalodimas at linaro.org
Wed Mar 24 15:23:52 CET 2021
Current code doesn't free the efi allocated memory in case the protocol
failed to install
Fixes: c8d0fd582576 ("efi_loader: Introduce eventlog support for TCG2_PROTOCOL")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
---
lib/efi_loader/efi_tcg2.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index 797d6eb134f6..02de63808f9a 100644
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -988,6 +988,7 @@ static efi_status_t create_final_event(void)
return EFI_SUCCESS;
out:
+ efi_free_pool(event_log.final_buffer);
return ret;
}
@@ -1041,8 +1042,12 @@ static efi_status_t efi_init_event_log(void)
event_log.last_event_size = event_log.pos;
ret = create_final_event();
+ if (ret != EFI_SUCCESS)
+ goto out;
+ return EFI_SUCCESS;
out:
+ efi_free_pool(event_log.buffer);
return ret;
}
@@ -1055,23 +1060,31 @@ out:
*/
efi_status_t efi_tcg2_register(void)
{
- efi_status_t ret;
+ efi_status_t ret = EFI_SUCCESS;
struct udevice *dev;
ret = platform_get_tpm2_device(&dev);
if (ret != EFI_SUCCESS) {
log_warning("Unable to find TPMv2 device\n");
- return EFI_SUCCESS;
+ ret = EFI_SUCCESS;
+ goto out;
}
ret = efi_init_event_log();
if (ret != EFI_SUCCESS)
- return ret;
+ goto fail;
ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol,
(void *)&efi_tcg2_protocol);
- if (ret != EFI_SUCCESS)
+ if (ret != EFI_SUCCESS) {
log_err("Cannot install EFI_TCG2_PROTOCOL\n");
+ goto fail;
+ }
+out:
+ return ret;
+fail:
+ efi_free_pool(event_log.final_buffer);
+ efi_free_pool(event_log.buffer);
return ret;
}
--
2.31.0
More information about the U-Boot
mailing list