diff options
author | Stephen Cprek <smcprek@us.ibm.com> | 2017-11-21 16:09:22 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-12-05 14:37:19 -0500 |
commit | ca52131dad3de16f44b9c9f07b5413edf1e9742a (patch) | |
tree | 56a0fcd4357510dee0fa25883dea463cfdb1433b /src/usr/sbe | |
parent | 89f7297255af3b70c6c1f7a3845498d13eff5cfd (diff) | |
download | talos-hostboot-ca52131dad3de16f44b9c9f07b5413edf1e9742a.tar.gz talos-hostboot-ca52131dad3de16f44b9c9f07b5413edf1e9742a.zip |
Handle ContainerHeader asserts more nicely with error logs
Change-Id: I2dfd02bd7c7f5b5356cd93ca967482c2d7f79ec1
RTC: 178520
RTC: 181899
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49966
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/sbe')
-rw-r--r-- | src/usr/sbe/sbe_update.C | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index bb23872d7..ffb957cfb 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -5779,7 +5779,13 @@ errlHndl_t secureKeyTransition() // Get new verified HW key hash const void* l_pVaddr = reinterpret_cast<void*>(l_secInfo.vaddr); - SECUREBOOT::ContainerHeader l_nestedConHdr(l_pVaddr); + SECUREBOOT::ContainerHeader l_nestedConHdr; + l_errl = l_nestedConHdr.setHeader(l_pVaddr); + if(l_errl) + { + TRACFCOMP( g_trac_sbe, ERR_MRK"secureKeyTransition() - setheader failed"); + break; + } // Get pointer to first element of hwKeyHash from header. const uint8_t* l_hwKeyHash = l_nestedConHdr.hwKeyHash()[0]; // Update global variable with hw keys hash to transition to. |