diff options
| author | Philipp Deppenwiese <zaolin@das-labor.org> | 2018-07-30 01:15:20 +0200 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-07-30 15:47:23 +0000 |
| commit | 791ba97d1d1f5923303f159ac0da154e082a12f2 (patch) | |
| tree | b116dac36ce35d041c8518de7615f723db28e428 | |
| parent | f849972f65954a5ae86f381406fe77be2b09d978 (diff) | |
security/tpm: Use unique CBMEM names for TCPA logs
Fix regression introduced in commit f18dc5c7
"Add TCPA logging functionality":
Introduced TCPA log got overwritten in acpi.c of x86/arch, due to
CBMEM name collision. Use a different cbmem name to have two independent
TCPA logs.
Change-Id: Iac63ac26989080a401aac2273265a263a3fdec56
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/27726
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
| -rw-r--r-- | src/arch/x86/acpi.c | 4 | ||||
| -rw-r--r-- | src/commonlib/include/commonlib/cbmem_id.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 60d2879219..8d7579d41c 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -260,14 +260,14 @@ static void *get_tcpa_log(u32 *size) const struct cbmem_entry *ce; const u32 tcpa_default_log_len = 0x10000; void *lasa; - ce = cbmem_entry_find(CBMEM_ID_TCPA_LOG); + ce = cbmem_entry_find(CBMEM_ID_TCPA_TCG_LOG); if (ce) { lasa = cbmem_entry_start(ce); *size = cbmem_entry_size(ce); printk(BIOS_DEBUG, "TCPA log found at %p\n", lasa); return lasa; } - lasa = cbmem_add(CBMEM_ID_TCPA_LOG, tcpa_default_log_len); + lasa = cbmem_add(CBMEM_ID_TCPA_TCG_LOG, tcpa_default_log_len); if (!lasa) { printk(BIOS_ERR, "TCPA log creation failed\n"); return NULL; diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h index cc2fed1402..287de1d0ba 100644 --- a/src/commonlib/include/commonlib/cbmem_id.h +++ b/src/commonlib/include/commonlib/cbmem_id.h @@ -64,7 +64,7 @@ #define CBMEM_ID_STAGEx_RAW 0x57a9e200 #define CBMEM_ID_STORAGE_DATA 0x53746f72 #define CBMEM_ID_TCPA_LOG 0x54435041 -#define CBMEM_ID_TCPA_COMPLIANT_LOG 0x54445041 +#define CBMEM_ID_TCPA_TCG_LOG 0x54445041 #define CBMEM_ID_TIMESTAMP 0x54494d45 #define CBMEM_ID_VBOOT_HANDOFF 0x780074f0 #define CBMEM_ID_VBOOT_SEL_REG 0x780074f1 @@ -121,7 +121,7 @@ { CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \ { CBMEM_ID_STORAGE_DATA, "SD/MMC/eMMC" }, \ { CBMEM_ID_TCPA_LOG, "TCPA LOG " }, \ - { CBMEM_ID_TCPA_COMPLIANT_LOG, "TCPA COMPLIANT LOG " }, \ + { CBMEM_ID_TCPA_TCG_LOG, "TCPA TCGLOG" }, \ { CBMEM_ID_TIMESTAMP, "TIME STAMP " }, \ { CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \ { CBMEM_ID_VBOOT_SEL_REG, "VBOOT SEL " }, \ |