GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Philipp Deppenwiese 2018-07-30 01:15:20 +02:00 committed by Philipp Deppenwiese
parent f849972f65
commit 791ba97d1d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/x86/acpi.c
View File

@ -260,14 +260,14 @@ static void *get_tcpa_log(u32 *size)
const struct cbmem_entry *ce; const struct cbmem_entry *ce;
const u32 tcpa_default_log_len = 0x10000; const u32 tcpa_default_log_len = 0x10000;
void *lasa; void *lasa;
ce = cbmem_entry_find(CBMEM_ID_TCPA_LOG); ce = cbmem_entry_find(CBMEM_ID_TCPA_TCG_LOG);
if (ce) { if (ce) {
lasa = cbmem_entry_start(ce); lasa = cbmem_entry_start(ce);
*size = cbmem_entry_size(ce); *size = cbmem_entry_size(ce);
printk(BIOS_DEBUG, "TCPA log found at %p\n", lasa); printk(BIOS_DEBUG, "TCPA log found at %p\n", lasa);
return 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) { if (!lasa) {
printk(BIOS_ERR, "TCPA log creation failed\n"); printk(BIOS_ERR, "TCPA log creation failed\n");
return NULL; return NULL;

4
src/commonlib/include/commonlib/cbmem_id.h
View File

@ -64,7 +64,7 @@
#define CBMEM_ID_STAGEx_RAW 0x57a9e200 #define CBMEM_ID_STAGEx_RAW 0x57a9e200
#define CBMEM_ID_STORAGE_DATA 0x53746f72 #define CBMEM_ID_STORAGE_DATA 0x53746f72
#define CBMEM_ID_TCPA_LOG 0x54435041 #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_TIMESTAMP 0x54494d45
#define CBMEM_ID_VBOOT_HANDOFF 0x780074f0 #define CBMEM_ID_VBOOT_HANDOFF 0x780074f0
#define CBMEM_ID_VBOOT_SEL_REG 0x780074f1 #define CBMEM_ID_VBOOT_SEL_REG 0x780074f1
@ -121,7 +121,7 @@
{ CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \ { CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \
{ CBMEM_ID_STORAGE_DATA, "SD/MMC/eMMC" }, \ { CBMEM_ID_STORAGE_DATA, "SD/MMC/eMMC" }, \
{ CBMEM_ID_TCPA_LOG, "TCPA LOG " }, \ { 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_TIMESTAMP, "TIME STAMP " }, \
{ CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \ { CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \
{ CBMEM_ID_VBOOT_SEL_REG, "VBOOT SEL " }, \ { CBMEM_ID_VBOOT_SEL_REG, "VBOOT SEL " }, \