<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27769">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/tpm: TCPA log follow up<br><br>* Make tcpa_log_init static and remove<br>init call<br>* Fix tcpa_log_add_table_entry<br><br>Change-Id: I215d79eed7ad17c6ab87f0c4b14a282e519ef07d<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/commonlib/include/commonlib/tcpa_log_serialized.h<br>M src/drivers/tpm/tpm.c<br>M src/security/tpm/tspi.h<br>M src/security/tpm/tspi/log.c<br>M src/security/vboot/secdata_tpm.c<br>5 files changed, 18 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/27769/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/commonlib/include/commonlib/tcpa_log_serialized.h b/src/commonlib/include/commonlib/tcpa_log_serialized.h</span><br><span>index cd6fbec..6dfb566 100644</span><br><span>--- a/src/commonlib/include/commonlib/tcpa_log_serialized.h</span><br><span>+++ b/src/commonlib/include/commonlib/tcpa_log_serialized.h</span><br><span>@@ -29,7 +29,7 @@</span><br><span> uint32_t pcr;</span><br><span> uint8_t digest[TCPA_DIGEST_MAX_LENGTH];</span><br><span> uint32_t digest_length;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t name[TCPA_PCR_HASH_NAME];</span><br><span style="color: hsl(120, 100%, 40%);">+ char name[TCPA_PCR_HASH_NAME];</span><br><span> } __packed;</span><br><span> </span><br><span> struct tcpa_table {</span><br><span>diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c</span><br><span>index 8c68159..e4a81c3 100644</span><br><span>--- a/src/drivers/tpm/tpm.c</span><br><span>+++ b/src/drivers/tpm/tpm.c</span><br><span>@@ -30,9 +30,6 @@</span><br><span> #else</span><br><span> tpm_setup(false);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- // TCPA cbmem log</span><br><span style="color: hsl(0, 100%, 40%);">- tcpa_log_init();</span><br><span> }</span><br><span> </span><br><span> BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, init_tpm_dev, NULL);</span><br><span>diff --git a/src/security/tpm/tspi.h b/src/security/tpm/tspi.h</span><br><span>index 94b53b0..e4ddefc 100644</span><br><span>--- a/src/security/tpm/tspi.h</span><br><span>+++ b/src/security/tpm/tspi.h</span><br><span>@@ -21,11 +21,6 @@</span><br><span> #include <commonlib/tcpa_log_serialized.h></span><br><span> </span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Setup TCPA cbmem log.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-void tcpa_log_init(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span> * Add table entry for cbmem TCPA log.</span><br><span> */</span><br><span> void tcpa_log_add_table_entry(const char *name, const uint32_t pcr,</span><br><span>diff --git a/src/security/tpm/tspi/log.c b/src/security/tpm/tspi/log.c</span><br><span>index 8ec4c6d..50a23d9 100644</span><br><span>--- a/src/security/tpm/tspi/log.c</span><br><span>+++ b/src/security/tpm/tspi/log.c</span><br><span>@@ -18,42 +18,41 @@</span><br><span> #include <console/console.h></span><br><span> #include <security/tpm/tspi.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void tcpa_log_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct tcpa_table *tcpa_log_init(void)</span><br><span> {</span><br><span> const struct cbmem_entry *ce;</span><br><span style="color: hsl(0, 100%, 40%);">- struct tcpa_table *tclt;</span><br><span style="color: hsl(120, 100%, 40%);">+ static struct tcpa_table *tclt;</span><br><span> </span><br><span> if (!cbmem_possibly_online())</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> ce = cbmem_entry_find(CBMEM_ID_TCPA_LOG);</span><br><span> if (ce)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> tclt = cbmem_add(CBMEM_ID_TCPA_LOG,</span><br><span> sizeof(struct tcpa_table) +</span><br><span style="color: hsl(0, 100%, 40%);">- MAX_TCPA_LOG_ENTRIES *</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(struct tcpa_entry));</span><br><span style="color: hsl(120, 100%, 40%);">+ MAX_TCPA_LOG_ENTRIES *</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(struct tcpa_entry));</span><br><span> </span><br><span> if (!tclt)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> tclt->max_entries = MAX_TCPA_LOG_ENTRIES;</span><br><span> tclt->num_entries = 0;</span><br><span> </span><br><span> printk(BIOS_DEBUG, "TCPA log created at %p\n", tclt);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return tclt;</span><br><span> }</span><br><span> </span><br><span> void tcpa_log_add_table_entry(const char *name, const uint32_t pcr,</span><br><span> const uint8_t *digest, const size_t digest_length)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- MAYBE_STATIC struct tcpa_table *tclt = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tcpa_table *tclt;</span><br><span> struct tcpa_entry *tce;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!cbmem_possibly_online())</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tclt = cbmem_find(CBMEM_ID_TCPA_LOG);</span><br><span style="color: hsl(120, 100%, 40%);">+ tclt = tcpa_log_init();</span><br><span> if (!tclt) {</span><br><span> printk(BIOS_ERR, "ERROR: No TCPA log table found\n");</span><br><span> return;</span><br><span>@@ -66,8 +65,13 @@</span><br><span> </span><br><span> tce = &tclt->entries[tclt->num_entries++];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(tce->name, name, TCPA_PCR_HASH_NAME);</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy(tce->name, name, TCPA_PCR_HASH_NAME);</span><br><span> tce->pcr = pcr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (digest_length > TCPA_DIGEST_MAX_LENGTH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_WARNING, "ERROR: PCR digest too long for TCPA log entry\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> memcpy(tce->digest, digest, digest_length);</span><br><span> tce->digest_length = digest_length;</span><br><span> }</span><br><span>diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c</span><br><span>index d3f4a11..c62f18b 100644</span><br><span>--- a/src/security/vboot/secdata_tpm.c</span><br><span>+++ b/src/security/vboot/secdata_tpm.c</span><br><span>@@ -451,9 +451,6 @@</span><br><span> if (result == TPM_E_MUST_REBOOT)</span><br><span> ctx->flags |= VB2_CONTEXT_SECDATA_WANTS_REBOOT;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // TCPA cbmem log</span><br><span style="color: hsl(0, 100%, 40%);">- tcpa_log_init();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return result;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27769">change 27769</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/27769"/><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: I215d79eed7ad17c6ab87f0c4b14a282e519ef07d </div>
<div style="display:none"> Gerrit-Change-Number: 27769 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>