<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22734">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/tpm: Fix coding style and uninitialized variable<br><br>Change-Id: Ifa93c91aab97c663df66dfdc4d1afb3a43736adb<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/security/tpm/tss/tcg-1.2/tss.c<br>1 file changed, 23 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/22734/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c<br>index b6a61c1..1602ba1 100644<br>--- a/src/security/tpm/tss/tcg-1.2/tss.c<br>+++ b/src/security/tpm/tss/tcg-1.2/tss.c<br>@@ -16,26 +16,24 @@<br> <br> #include <arch/early_variables.h><br> #include <assert.h><br>-#include <string.h><br> #include <security/tpm/tis.h><br>-#include <vb2_api.h><br> #include <security/tpm/tss.h><br>+#include <string.h><br>+#include <vb2_api.h><br> <br>-#include "tss_internal.h"<br> #include "tss_commands.h"<br>+#include "tss_internal.h"<br> <br> #ifdef FOR_TEST<br> #include <stdio.h><br>-#define VBDEBUG(format, args...) printf(format, ## args)<br>+#define VBDEBUG(format, args...) printf(format, ##args)<br> #else<br> #include <console/console.h><br>-#define VBDEBUG(format, args...) printk(BIOS_DEBUG, format, ## args)<br>+#define VBDEBUG(format, args...) printk(BIOS_DEBUG, format, ##args)<br> #endif<br> <br>-static int tpm_send_receive(const uint8_t *request,<br>- uint32_t request_length,<br>- uint8_t *response,<br>- uint32_t *response_length)<br>+static int tpm_send_receive(const uint8_t *request, uint32_t request_length,<br>+ uint8_t *response, uint32_t *response_length)<br> {<br> size_t len = *response_length;<br> if (tis_sendrecv(request, request_length, response, &len))<br>@@ -54,12 +52,12 @@<br> }<br> <br> /* Gets the size field of a TPM command. */<br>-__attribute__((unused))<br>-static inline int tpm_command_size(const uint8_t *buffer)<br>+__attribute__((unused)) static inline int<br>+tpm_command_size(const uint8_t *buffer)<br> {<br> uint32_t size;<br> from_tpm_uint32(buffer + sizeof(uint16_t), &size);<br>- return (int) size;<br>+ return (int)size;<br> }<br> <br> /* Gets the code field of a TPM command. */<br>@@ -85,8 +83,8 @@<br> uint32_t response_length = max_length;<br> uint32_t result;<br> <br>- result = tpm_send_receive(request, tpm_command_size(request),<br>- response, &response_length);<br>+ result = tpm_send_receive(request, tpm_command_size(request), response,<br>+ &response_length);<br> if (result != 0) {<br> /* Communication with TPM failed, so response is garbage */<br> VBDEBUG("TPM: command 0x%x send/receive failed: 0x%x\n",<br>@@ -100,20 +98,19 @@<br> * (and possibly expected length from the response header). See<br> * crosbug.com/17017 */<br> <br>- VBDEBUG("TPM: command 0x%x returned 0x%x\n",<br>- tpm_command_code(request), result);<br>+ VBDEBUG("TPM: command 0x%x returned 0x%x\n", tpm_command_code(request),<br>+ result);<br> <br>-return result;<br>+ return result;<br> }<br>-<br> <br> /* Sends a TPM command and gets a response. Returns 0 if success or the TPM<br> * error code if error. Waits for the self test to complete if needed. */<br> uint32_t tlcl_send_receive(const uint8_t *request, uint8_t *response,<br> int max_length)<br> {<br>- uint32_t result = tlcl_send_receive_no_retry(request, response,<br>- max_length);<br>+ uint32_t result =<br>+ tlcl_send_receive_no_retry(request, response, max_length);<br> /* If the command fails because the self test has not completed, try it<br> * again after attempting to ensure that the self test has completed. */<br> if (result == TPM_E_NEEDS_SELFTEST || result == TPM_E_DOING_SELFTEST) {<br>@@ -122,8 +119,8 @@<br> return result;<br> #if defined(TPM_BLOCKING_CONTINUESELFTEST) || defined(VB_RECOVERY_MODE)<br> /* Retry only once */<br>- result = tlcl_send_receive_no_retry(request, response,<br>- max_length);<br>+ result =<br>+ tlcl_send_receive_no_retry(request, response, max_length);<br> #else<br> /* This needs serious testing. The TPM specification says: "iii.<br> * The caller MUST wait for the actions of TPM_ContinueSelfTest<br>@@ -209,7 +206,7 @@<br> struct s_tpm_nv_write_cmd cmd;<br> uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];<br> const int total_length =<br>- kTpmRequestHeaderLength + kWriteInfoLength + length;<br>+ kTpmRequestHeaderLength + kWriteInfoLength + length;<br> <br> VBDEBUG("TPM: tlcl_write(0x%x, %d)\n", index, length);<br> memcpy(&cmd, &tpm_nv_write_cmd, sizeof(cmd));<br>@@ -245,7 +242,6 @@<br> <br> return result;<br> }<br>-<br> <br> uint32_t tlcl_assert_physical_presence(void)<br> {<br>@@ -327,13 +323,12 @@<br> <br> uint32_t tlcl_set_global_lock(void)<br> {<br>- uint32_t x;<br>+ uint32_t x = 0;<br> VBDEBUG("TPM: Set global lock\n");<br>- return tlcl_write(TPM_NV_INDEX0, (uint8_t *) &x, 0);<br>+ return tlcl_write(TPM_NV_INDEX0, (uint8_t *)&x, 0);<br> }<br> <br>-uint32_t tlcl_extend(int pcr_num, const uint8_t *in_digest,<br>- uint8_t *out_digest)<br>+uint32_t tlcl_extend(int pcr_num, const uint8_t *in_digest, uint8_t *out_digest)<br> {<br> struct s_tpm_extend_cmd cmd;<br> uint8_t response[kTpmResponseHeaderLength + kPcrDigestLength];<br></pre><p>To view, visit <a href="https://review.coreboot.org/22734">change 22734</a>. To unsubscribe, 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/22734"/><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: Ifa93c91aab97c663df66dfdc4d1afb3a43736adb </div>
<div style="display:none"> Gerrit-Change-Number: 22734 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>