Skip to content

Commit

Permalink
Fix invalid pointer access in HBRT during PM Reset
Browse files Browse the repository at this point in the history
Change-Id: I2fbe6876ec01da128ebc7282dfc879eb67690f68
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46720
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: Stephen M. Cprek <smcprek@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
sannerd authored and dcrowell77 committed Oct 5, 2017
1 parent 46a6db6 commit 67e37f1
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/usr/util/utillidpnor.C
Expand Up @@ -158,7 +158,15 @@ bool UtilLidMgr::getLidPnorSectionInfo(uint32_t i_lidId,
#endif
#endif
// @TODO CQ:SW400352 remove this check
if ((l_secId == PNOR::OCC) && PNOR::isSectionEmpty(l_secId))
if ((l_secId == PNOR::OCC)
#ifndef __HOSTBOOT_RUNTIME
&& PNOR::isSectionEmpty(l_secId)
#else
//use this check for HBRT due to secure lid load setting vaddr
//to zero -- which causes isSectionEmpty to segfault
&& !o_lidPnorInfo.vaddr
#endif
)
{
UTIL_FT("UtilLidMgr::getLidPnorSection PNOR section %s is empty get data from LID transfer",
PNOR::SectionIdToString(l_secId));
Expand All @@ -170,4 +178,4 @@ bool UtilLidMgr::getLidPnorSectionInfo(uint32_t i_lidId,
} while(0);

return l_lidInPnor;
}
}

0 comments on commit 67e37f1

Please sign in to comment.