5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerry Snitselaar jsnitsel@redhat.com
[ Upstream commit f4cd18c5b2000df0c382f6530eeca9141ea41faf ]
memblock_reserve() expects a physical address, but the address being passed for the TPM final events log is what was returned from early_memremap(). This results in something like the following:
[ 0.000000] memblock_reserve: [0xffffffffff2c0000-0xffffffffff2c00e4] efi_tpm_eventlog_init+0x324/0x370
Pass the address from efi like what is done for the TPM events log.
Fixes: c46f3405692d ("tpm: Reserve the TPM final events table") Cc: Matthew Garrett mjg59@google.com Cc: Jarkko Sakkinen jarkko@kernel.org Cc: Bartosz Szczepanek bsz@semihalf.com Cc: Ard Biesheuvel ardb@kernel.org Signed-off-by: Jerry Snitselaar jsnitsel@redhat.com Acked-by: Jarkko Sakkinen jarkko@kernel.org Signed-off-by: Ard Biesheuvel ardb@kernel.org Stable-dep-of: e6d654e9f5a9 ("tpm: fix signed/unsigned bug when checking event logs") Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index 8f665678e9e39..e8d69bd548f3f 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -97,7 +97,7 @@ int __init efi_tpm_eventlog_init(void) goto out_calc; }
- memblock_reserve((unsigned long)final_tbl, + memblock_reserve(efi.tpm_final_log, tbl_size + sizeof(*final_tbl)); efi_tpm_final_log_size = tbl_size;