From 8443a65a3599f433bd47c2ea03e863240db28b89 Mon Sep 17 00:00:00 2001 From: Stephen Cprek Date: Tue, 23 Jan 2018 14:27:17 -0600 Subject: Collect better FFDC on ROM verification errors Collect both the UTIL and RUNTIME component traces on a ROM verify failure Added a new Errlog User Details sections "Verify Info" containing the component name, ID(s), measured, and expected hashes Change-Id: I0d0408128e05807bb906be5ee365d56d1416693f CQ:SW413889 Backport:release-fips910 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52593 Reviewed-by: Michael Baiocchi Reviewed-by: Nicholas E. Bofferding Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Marshall J. Wilks Reviewed-by: Daniel M. Crowell --- src/usr/secureboot/common/errlud_secure.C | 51 +++++++++- src/usr/secureboot/common/errlud_secure.H | 51 +++++++++- src/usr/secureboot/common/plugins/errludP_secure.H | 106 ++++++++++++++++++++- .../common/plugins/secureUdParserFactory.H | 5 +- 4 files changed, 209 insertions(+), 4 deletions(-) (limited to 'src/usr/secureboot/common') diff --git a/src/usr/secureboot/common/errlud_secure.C b/src/usr/secureboot/common/errlud_secure.C index 1af61daba..68a0efcc1 100644 --- a/src/usr/secureboot/common/errlud_secure.C +++ b/src/usr/secureboot/common/errlud_secure.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2017 */ +/* Contributors Listed Below - COPYRIGHT 2014,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -31,6 +31,10 @@ #include #include "errlud_secure.H" #include +#include +#include +#include +#include namespace SECUREBOOT { @@ -164,5 +168,50 @@ UdSecuritySettings::~UdSecuritySettings() } +//------------------------------------------------------------------------------ +// SECURE Verify Info User Details +//------------------------------------------------------------------------------ +UdVerifyInfo::UdVerifyInfo(const char* i_compId, + const uint64_t i_protectedSize, + const RomVerifyIds& i_ids, + const SHA512_t& i_measuredHash, + const SHA512_t& i_expectedHash) +{ + // Set up Ud instance variables + iv_CompId = SECURE_COMP_ID; + iv_Version = SECURE_UDT_VERSION_1; + iv_SubSection = SECURE_UDT_VERIFY_INFO; + + //***** Version SECURE_UDT_VERSION_1 Memory Layout ***** + // 9 bytes Max : Component ID (8 byte string + NULL) use strlen + // 8 bytes : Protected Payload Size + // 4 bytes : Number of IDs + // 4*N bytes : IDs (PNOR id or LidID) multiplied by number of ids + // 64 bytes : Measured Hash + // 64 bytes : Expected Hash + + UtilMem l_memBuf {}; + l_memBuf.write(i_compId, strlen(i_compId)+1); + l_memBuf << i_protectedSize; + l_memBuf << static_cast(i_ids.size()); + for (auto id : i_ids) + { + l_memBuf << id; + } + l_memBuf.write(i_measuredHash, PARSER_SIZEOF_SHA512_t); + l_memBuf.write(i_expectedHash, PARSER_SIZEOF_SHA512_t); + + auto l_memBufErr = l_memBuf.getLastError(); + if(l_memBufErr) + { + errlCommit(l_memBufErr,SECURE_COMP_ID); + } + else + { + char * l_pBuf = reinterpret_cast(reallocUsrBuf(l_memBuf.size())); + memcpy(l_pBuf, l_memBuf.base(), l_memBuf.size()); + } +} + } // end SECUREBOOT namespace diff --git a/src/usr/secureboot/common/errlud_secure.H b/src/usr/secureboot/common/errlud_secure.H index dddc479eb..1e05399b1 100644 --- a/src/usr/secureboot/common/errlud_secure.H +++ b/src/usr/secureboot/common/errlud_secure.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -174,6 +174,55 @@ class UdSecuritySettings : public ERRORLOG::ErrlUserDetails }; +/** + * @class UdVerifyInfo + * + * Adds Secure verification info to an error log as user detail data + */ +class UdVerifyInfo : public ERRORLOG::ErrlUserDetails +{ + public: + /** + * @brief Constructor + * @param[in] i_compId Component ID associated with blob being verified + * @param[in] i_protectedSize Protected Payload Size + * @param[in] i_ids Vector of IDs (PNOR or Lid Id(s)) associated with + * the blob that is being verified. + * @param[in] i_measuredHash Measured SHA512 Hash + * @param[in] i_expectedHash Expected SHA512 Hash + */ + UdVerifyInfo(const char* i_compId, + const uint64_t i_protectedSize, + const RomVerifyIds& i_ids, + const SHA512_t& i_measuredHash, + const SHA512_t& i_expectedHash); + + /** + * @brief Destructor + */ + virtual ~UdVerifyInfo() {} + + /** + * Delete Copy Constructor + */ + UdVerifyInfo(const UdVerifyInfo&) = delete; + + /** + * Delete Copy Assignment + */ + UdVerifyInfo& operator= (const UdVerifyInfo&) = delete; + + /** + * Delete Move Constructor + */ + UdVerifyInfo (UdVerifyInfo&&) = delete; + + /** + * Delete Move Assignment + */ + UdVerifyInfo& operator = (UdVerifyInfo&&) = delete; +}; + } // end SECUREBOOT namespace #endif diff --git a/src/usr/secureboot/common/plugins/errludP_secure.H b/src/usr/secureboot/common/plugins/errludP_secure.H index 39a8126d6..817967bbf 100644 --- a/src/usr/secureboot/common/plugins/errludP_secure.H +++ b/src/usr/secureboot/common/plugins/errludP_secure.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,12 +33,15 @@ #include "errluserdetails.H" #include +#include /** * Some macros to manipulate data types cleanly */ #define TO_UINT8(ptr) (*(reinterpret_cast(ptr))) +#define TO_UINT16(ptr) (ntohs(*(reinterpret_cast(ptr)))) #define TO_UINT32(ptr) (ntohl(*(reinterpret_cast(ptr)))) +#define TO_UINT64(ptr) (ntohll(*(reinterpret_cast(ptr)))) namespace SECUREBOOT { @@ -47,6 +50,7 @@ namespace SECUREBOOT */ enum { UDPARSER_SIZEOF_SHA512_t = 64, + UDPARSER_SIZEOF_MAX_VERIFY_IDS = 50, }; /** @@ -229,6 +233,106 @@ class UdParserSecuritySettings : public ERRORLOG::ErrlUserDetailsParser }; }; +/** + * @class UdParserVerifyInfo + * + * Parses UdSecureVerifyInfo + */ +class UdParserVerifyInfo : public ERRORLOG::ErrlUserDetailsParser +{ + public: + /** + * @brief Constructor + */ + UdParserVerifyInfo() {} + + /** + * @brief Destructor + */ + virtual ~UdParserVerifyInfo() {} + + /** + * @brief Parses verify container user detail data from an error log + * + * @param i_version Version of the data + * @param i_parse ErrlUsrParser object for outputting information + * @param i_pBuffer Pointer to buffer containing detail data + * @param i_buflen Length of the buffer + */ + virtual void parse(errlver_t i_version, + ErrlUsrParser & i_parser, + void * i_pBuffer, + const uint32_t i_buflen) const + { + //***** Version 1 Memory Layout ***** + // 9 bytes Max : Component ID (8 byte string + NULL) use strlen + // 8 bytes : Protected Payload Size + // 4 bytes : Number of IDs + // 4*N bytes : IDs (PNOR id or LidID) multiplied by number of ids + // 64 bytes : Measured Hash + // 64 bytes : Expected Hash + + char* l_databuf = static_cast(i_pBuffer); + bool l_parseError = false; + + do { + i_parser.PrintHeading("Secure Verify Info"); + if (i_version >= 1) + { + // Component ID + i_parser.PrintString("Component ID", l_databuf); + // Skip string plus 1 byte for null termination + l_databuf += strlen(l_databuf)+1; + + // Number of IDs + uint64_t l_protectedSize = TO_UINT64(l_databuf); + i_parser.PrintNumberUint64("Protected Payload Size","0x%016llX", + l_protectedSize); + l_databuf += sizeof(l_protectedSize); + + // Number of IDs + uint32_t l_numIds = TO_UINT32(l_databuf); + i_parser.PrintNumber("Number of IDs","%d", l_numIds); + l_databuf += sizeof(l_numIds); + + // IDs + i_parser.PrintHeading("ID(s)"); + for (uint32_t i = 0; i < l_numIds; ++i) + { + i_parser.PrintNumber("ID","0x%08lX", TO_UINT32(l_databuf)); + l_databuf += sizeof(uint32_t); + // In case of bad format, don't go past max size + if(i >= UDPARSER_SIZEOF_MAX_VERIFY_IDS) + { + l_parseError = true; + break; + } + } + // In case of bad format, don't continue to parse section + if(l_parseError) + { + break; + } + + // Measured Hash + i_parser.PrintHeading("Measured Hash"); + i_parser.PrintHexDump(l_databuf, UDPARSER_SIZEOF_SHA512_t); + l_databuf += UDPARSER_SIZEOF_SHA512_t; + + /// Expected Hash + i_parser.PrintHeading("Expected Hash"); + i_parser.PrintHexDump(l_databuf, UDPARSER_SIZEOF_SHA512_t); + l_databuf += UDPARSER_SIZEOF_SHA512_t; + } + } while(0); + + } + + private: + // Disabled + UdParserVerifyInfo(const UdParserVerifyInfo&); + UdParserVerifyInfo & operator=(const UdParserVerifyInfo&); +}; } // end SECUREBOOT namespace diff --git a/src/usr/secureboot/common/plugins/secureUdParserFactory.H b/src/usr/secureboot/common/plugins/secureUdParserFactory.H index 5b6d540fa..d720c1ce1 100644 --- a/src/usr/secureboot/common/plugins/secureUdParserFactory.H +++ b/src/usr/secureboot/common/plugins/secureUdParserFactory.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,6 +44,9 @@ namespace SECUREBOOT registerParser (SECURE_UDT_SECURITY_SETTINGS); + + registerParser + (SECURE_UDT_VERIFY_INFO); } private: -- cgit v1.2.1