Skip to content

zynqmp: Fix null pHT segfault verifying partition-only images #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bradfa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

zynqmp: Fix null pHT segfault verifying partition-only images #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion zynqmp/src/verifyimage-zynqmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,15 @@ void ZynqMpReadImage::VerifyHeaderTableSignature()
size_t headersSize = bH->sourceOffset - bH->imageHeaderByteOffset - RSA_4096_KEY_LENGTH;
if(bH->sourceOffset == 0)
{
headersSize = (pHT->partitionWordOffset * 4) - bH->imageHeaderByteOffset - RSA_4096_KEY_LENGTH;
/* With no bootloader partition, the boot header carries no source offset
to mark the end of the signed header block, so use the first partition's
data offset instead. Read it from the pHTs list: ReadHeaderTableDetails
releases each table into pHTs, leaving the pHT member null. */
if (pHTs.empty())
{
LOG_ERROR("No partition headers found in bootimage file %s", binFilename.c_str());
}
headersSize = (pHTs.front()->partitionWordOffset * 4) - bH->imageHeaderByteOffset - RSA_4096_KEY_LENGTH;
}
auto tempBuffer = std::make_unique<uint8_t[]>(headersSize);
memset(tempBuffer.get(), 0, headersSize);
Expand Down