Skip to content

Commit e658c82

Browse files
snitsIngo Molnar
authored andcommitted
efi/tpm: Only set 'efi_tpm_final_log_size' after successful event log parsing
If __calc_tpm2_event_size() fails to parse an event it will return 0, resulting tpm2_calc_event_log_size() returning -1. Currently there is no check of this return value, and 'efi_tpm_final_log_size' can end up being set to this negative value resulting in a crash like this one: BUG: unable to handle page fault for address: ffffbc8fc00866ad #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page RIP: 0010:memcpy_erms+0x6/0x10 Call Trace: tpm_read_log_efi() tpm_bios_log_setup() tpm_chip_register() tpm_tis_core_init.cold.9+0x28c/0x466 tpm_tis_plat_probe() platform_drv_probe() ... Also __calc_tpm2_event_size() returns a size of 0 when it fails to parse an event, so update function documentation to reflect this. The root cause of the issue that caused the failure of event parsing in this case is resolved by Peter Jone's patchset dealing with large event logs where crossing over a page boundary causes the page with the event count to be unmapped. Signed-off-by: Jerry Snitselaar <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Cc: Ben Dooks <[email protected]> Cc: Dave Young <[email protected]> Cc: Jarkko Sakkinen <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Lukas Wunner <[email protected]> Cc: Lyude Paul <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Octavian Purdila <[email protected]> Cc: Peter Jones <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Scott Talbert <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Fixes: c46f340 ("tpm: Reserve the TPM final events table") Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 05c8c1f commit e658c82

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

drivers/firmware/efi/tpm.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,18 @@ int __init efi_tpm_eventlog_init(void)
8585
final_tbl->nr_events,
8686
log_tbl->log);
8787
}
88+
89+
if (tbl_size < 0) {
90+
pr_err(FW_BUG "Failed to parse event in TPM Final Events Log\n");
91+
goto out_calc;
92+
}
93+
8894
memblock_reserve((unsigned long)final_tbl,
8995
tbl_size + sizeof(*final_tbl));
90-
early_memunmap(final_tbl, sizeof(*final_tbl));
9196
efi_tpm_final_log_size = tbl_size;
9297

98+
out_calc:
99+
early_memunmap(final_tbl, sizeof(*final_tbl));
93100
out:
94101
early_memunmap(log_tbl, sizeof(*log_tbl));
95102
return ret;

include/linux/tpm_eventlog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ struct tcg_algorithm_info {
152152
* total. Once we've done this we know the offset of the data length field,
153153
* and can calculate the total size of the event.
154154
*
155-
* Return: size of the event on success, <0 on failure
155+
* Return: size of the event on success, 0 on failure
156156
*/
157157

158158
static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,

0 commit comments

Comments
 (0)