vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tpm: Fix bug in GRUB2 TPM module 

The value of tpm_handle changes between successive calls to grub_tpm_handle_find(),
as instead of simply copying the stored pointer we end up taking the address of
said pointer when using the cached value of grub_tpm_handle.

This causes grub_efi_open_protocol() to return a nullptr in grub_tpm2_execute()
and grub_tpm2_log_event(). Said nullptr goes unchecked and
efi_call_5(tpm->hash_log_extend_event,...) ends up jumping to 0x0, Qemu crashes
once video ROM is reached at 0xb0000.

This patch seems to do the trick of fixing that bug, but we should also ensure
that all calls to grub_efi_open_protocol() are checked so that we don't start
executing low memory.

Signed-off-by: Max Tottenham <mtottenh@akamai.com>
Reviewed-by: Matthew Garrett <mjg59@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Max Tottenham 2019-01-14 14:03:29 +00:00 committed by Vincent Batts
parent 140526af7d
commit 019c0941b8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub-core/commands/efi/tpm.c
View File

@ -89,7 +89,7 @@ grub_tpm_handle_find (grub_efi_handle_t *tpm_handle,
if (grub_tpm_handle != NULL)
{
*tpm_handle = &grub_tpm_handle;
*tpm_handle = grub_tpm_handle;
*protocol_version = grub_tpm_version;
return 1;
}