summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNick Bofferding <bofferdn@us.ibm.com>2018-02-22 14:13:11 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-02-24 21:33:06 -0500
commit24bc6a1bee514ae580733f1695c7d82edc4da4cb (patch)
tree8cecee3d371bdff974bf6533ebbd279e2505e5ba /src
parentd3593cc766ca6dcbb164967d6c13a620099b090c (diff)
downloadtalos-hostboot-24bc6a1bee514ae580733f1695c7d82edc4da4cb.tar.gz
talos-hostboot-24bc6a1bee514ae580733f1695c7d82edc4da4cb.zip
Secure Boot: On get jumper state error path, save PLID before committing
When SECUREBOOT::getJumperState() returns error, save off the error PLID before committing it, to avoid a segfault condition Change-Id: I968c73de11abf580b19720c4ee9689e38c155bb6 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54596 Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/usr/secureboot/trusted/trustedboot.C3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C
index 7f1417e1f..0c1e9e974 100644
--- a/src/usr/secureboot/trusted/trustedboot.C
+++ b/src/usr/secureboot/trusted/trustedboot.C
@@ -1130,9 +1130,8 @@ void tpmVerifyFunctionalTpmExists(
err = SECUREBOOT::getJumperState(l_state);
if (err)
{
- errlCommit(err, TRBOOT_COMP_ID);
-
auto errPlid = err->plid();
+ errlCommit(err, TRBOOT_COMP_ID);
// we should not continue if we could not read the jumper state
INITSERVICE::doShutdown(errPlid,isBackgroundShutdown);
OpenPOWER on IntegriCloud