[PATCH v2 5/5] Revert "tpm: do not ignore memblock_reserve return value"
Sang-Heon Jeon <[email protected]> Tue, 7 Jul 2026 01:37:53 +0900
| Newsgroups | org.kernel.vger.linux-efi,org.kernel.vger.linux-kernel,org.kvack.linux-mm |
|---|---|
| Message-ID | <[email protected]> |
This reverts commit c33c28f9f6e017702374e1ab907dfa5a63db5301. efi_tpm_eventlog_init() runs from efi_config_parse_tables() during early EFI initialization, before memblock_allow_resize(). At that point memblock_reserve() either succeeds or panics, never returning an error. Therefore the return value check is unreachable, so restore the original unconditional memblock_reserve(). No functional change. Signed-off-by: Sang-Heon Jeon <[email protected]> --- drivers/firmware/efi/tpm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index cdd431027065..288bcf7a5b99 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -61,12 +61,7 @@ int __init efi_tpm_eventlog_init(void) } tbl_size = sizeof(*log_tbl) + 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; - } + memblock_reserve(efi.tpm_log, tbl_size); if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR) { pr_info("TPM Final Events table not present\n"); -- 2.43.0