<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27726">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/tpm: Fix TCPA log commit<br><br>* TCPA log overwrites newly generated log<br>in acpi.c of x86/arch.<br><br>Change-Id: Iac63ac26989080a401aac2273265a263a3fdec56<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/arch/x86/acpi.c<br>M src/commonlib/include/commonlib/cbmem_id.h<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/27726/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c</span><br><span>index 60d2879..8d7579d 100644</span><br><span>--- a/src/arch/x86/acpi.c</span><br><span>+++ b/src/arch/x86/acpi.c</span><br><span>@@ -260,14 +260,14 @@</span><br><span> const struct cbmem_entry *ce;</span><br><span> const u32 tcpa_default_log_len = 0x10000;</span><br><span> void *lasa;</span><br><span style="color: hsl(0, 100%, 40%);">- ce = cbmem_entry_find(CBMEM_ID_TCPA_LOG);</span><br><span style="color: hsl(120, 100%, 40%);">+ ce = cbmem_entry_find(CBMEM_ID_TCPA_TCG_LOG);</span><br><span> if (ce) {</span><br><span> lasa = cbmem_entry_start(ce);</span><br><span> *size = cbmem_entry_size(ce);</span><br><span> printk(BIOS_DEBUG, "TCPA log found at %p\n", lasa);</span><br><span> return lasa;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- lasa = cbmem_add(CBMEM_ID_TCPA_LOG, tcpa_default_log_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ lasa = cbmem_add(CBMEM_ID_TCPA_TCG_LOG, tcpa_default_log_len);</span><br><span> if (!lasa) {</span><br><span> printk(BIOS_ERR, "TCPA log creation failed\n");</span><br><span> return NULL;</span><br><span>diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h</span><br><span>index cc2fed1..c0c1010 100644</span><br><span>--- a/src/commonlib/include/commonlib/cbmem_id.h</span><br><span>+++ b/src/commonlib/include/commonlib/cbmem_id.h</span><br><span>@@ -64,7 +64,7 @@</span><br><span> #define CBMEM_ID_STAGEx_RAW 0x57a9e200</span><br><span> #define CBMEM_ID_STORAGE_DATA 0x53746f72</span><br><span> #define CBMEM_ID_TCPA_LOG 0x54435041</span><br><span style="color: hsl(0, 100%, 40%);">-#define CBMEM_ID_TCPA_COMPLIANT_LOG 0x54445041</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBMEM_ID_TCPA_TCG_LOG 0x54445041</span><br><span> #define CBMEM_ID_TIMESTAMP 0x54494d45</span><br><span> #define CBMEM_ID_VBOOT_HANDOFF 0x780074f0</span><br><span> #define CBMEM_ID_VBOOT_SEL_REG 0x780074f1</span><br><span>@@ -121,7 +121,7 @@</span><br><span> { CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \</span><br><span> { CBMEM_ID_STORAGE_DATA, "SD/MMC/eMMC" }, \</span><br><span> { CBMEM_ID_TCPA_LOG, "TCPA LOG " }, \</span><br><span style="color: hsl(0, 100%, 40%);">- { CBMEM_ID_TCPA_COMPLIANT_LOG, "TCPA COMPLIANT LOG " }, \</span><br><span style="color: hsl(120, 100%, 40%);">+ { CBMEM_ID_TCPA_TCG_LOG, "TCPA TCG LOG" }, \</span><br><span> { CBMEM_ID_TIMESTAMP, "TIME STAMP " }, \</span><br><span> { CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \</span><br><span> { CBMEM_ID_VBOOT_SEL_REG, "VBOOT SEL " }, \</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27726">change 27726</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27726"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iac63ac26989080a401aac2273265a263a3fdec56 </div>
<div style="display:none"> Gerrit-Change-Number: 27726 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>