efi_selftest: error handling in efi_selftest_tcg2
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Sun, 1 May 2022 09:34:15 +0000 (11:34 +0200)
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Tue, 3 May 2022 19:39:22 +0000 (21:39 +0200)
If memory allocation fails, write an error message.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
lib/efi_selftest/efi_selftest_tcg2.c

index a2b4a79..67a886e 100644 (file)
@@ -631,8 +631,10 @@ static int efi_st_tcg2_setup(const efi_handle_t img_handle,
                                      sizeof(struct efi_tcg2_event) +
                                      sizeof(struct uefi_image_load_event),
                                      (void **)&efi_tcg2_event);
-       if (!efi_tcg2_event)
+       if (ret != EFI_SUCCESS) {
+               efi_st_error("Out of memory\n");
                return EFI_ST_FAILURE;
+       }
 
        efi_tcg2_event->size = sizeof(struct efi_tcg2_event) +
                               sizeof(struct uefi_image_load_event);
@@ -659,8 +661,10 @@ static int efi_st_tcg2_setup(const efi_handle_t img_handle,
                                      (EFI_TCG2_MAX_PCR_INDEX + 1) *
                                      TPM2_SHA256_DIGEST_SIZE,
                                      (void **)&pcrs);
-       if (!pcrs)
+       if (ret != EFI_SUCCESS) {
+               efi_st_error("Out of memory\n");
                return EFI_ST_FAILURE;
+       }
 
        boottime->set_mem(pcrs, (EFI_TCG2_MAX_PCR_INDEX + 1) * TPM2_SHA256_DIGEST_SIZE, 0);