diff options
| author |   Gregory Price <gourry@gourry.net> | 2024-09-13 19:19:52 -0400 |
|---|---|---|
| committer |   Ard Biesheuvel <ardb@kernel.org> | 2024-10-15 20:27:29 +0200 |
| commit | c33c28f9f6e017702374e1ab907dfa5a63db5301 (patch) | |
| tree | 74d2c28e5dbadb2ab5d3164f431252a374d215a5 | |
| parent | tpm: fix signed/unsigned bug when checking event logs (diff) | |
| download | wireguard-linux-c33c28f9f6e017702374e1ab907dfa5a63db5301.tar.xz wireguard-linux-c33c28f9f6e017702374e1ab907dfa5a63db5301.zip | |
tpm: do not ignore memblock_reserve return value
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/firmware/efi/tpm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index 9c3613e6af15..b0cc2cc11d7e 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -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"); |