Skip to content

Commit

Permalink
tpm: do not ignore memblock_reserve return value
Browse files Browse the repository at this point in the history
tpm code currently ignores a relevant failure case silently.
Add an error to make this failure non-silent.

Signed-off-by: Gregory Price <gourry@gourry.net>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
  • Loading branch information
Gregory Price authored and Ard Biesheuvel committed Oct 15, 2024
1 parent e6d654e commit c33c28f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/firmware/efi/tpm.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ int __init efi_tpm_eventlog_init(void)
}

tbl_size = sizeof(*log_tbl) + log_tbl->size;
memblock_reserve(efi.tpm_log, tbl_size);
if (memblock_reserve(efi.tpm_log, tbl_size)) {
pr_err("TPM Event Log memblock reserve fails (0x%lx, 0x%x)\n",
efi.tpm_log, tbl_size);
ret = -ENOMEM;
goto out;
}

if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR) {
pr_info("TPM Final Events table not present\n");
Expand Down

0 comments on commit c33c28f

Please sign in to comment.