<p>Joel Kitching has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28748">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tpm/tpm_setup: fail on invalid result from tlcl_resume<br><br>BUG=b:114018226<br>TEST=None<br><br>Change-Id: I8f5df2b0119d35e4000fe62bf1bba6ca07f925f3<br>Signed-off-by: Joel Kitching <kitching@google.com><br>---<br>M src/security/tpm/tspi/tspi.c<br>1 file changed, 17 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/28748/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/security/tpm/tspi/tspi.c b/src/security/tpm/tspi/tspi.c</span><br><span>index 950e930..7782943 100644</span><br><span>--- a/src/security/tpm/tspi/tspi.c</span><br><span>+++ b/src/security/tpm/tspi/tspi.c</span><br><span>@@ -100,10 +100,24 @@</span><br><span>     /* Handle special init for S3 resume path */</span><br><span>         if (s3flag) {</span><br><span>                result = tlcl_resume();</span><br><span style="color: hsl(0, 100%, 40%);">-         if (result == TPM_E_INVALID_POSTINIT)</span><br><span style="color: hsl(0, 100%, 40%);">-                   printk(BIOS_INFO, "TPM: Already initialized.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+           switch (result) {</span><br><span style="color: hsl(120, 100%, 40%);">+             case TPM_SUCCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+                     break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-              return TPM_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+           case TPM_E_INVALID_POSTINIT:</span><br><span style="color: hsl(120, 100%, 40%);">+                  /*</span><br><span style="color: hsl(120, 100%, 40%);">+                     * We're on a platform where the TPM maintains power</span><br><span style="color: hsl(120, 100%, 40%);">+                       * in S3, so it's already initialized.</span><br><span style="color: hsl(120, 100%, 40%);">+                     */</span><br><span style="color: hsl(120, 100%, 40%);">+                   printk(BIOS_INFO, "TPM: Already initialized.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                   result = TPM_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+                 break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              default:</span><br><span style="color: hsl(120, 100%, 40%);">+                      printk(BIOS_ERR, "TPM: Resume failed.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                  break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              goto out;</span><br><span>    }</span><br><span> </span><br><span>        result = tlcl_startup();</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28748">change 28748</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/28748"/><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: I8f5df2b0119d35e4000fe62bf1bba6ca07f925f3 </div>
<div style="display:none"> Gerrit-Change-Number: 28748 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>