jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-24 08:58:23 +08:00
Code Issues Projects Releases Wiki Activity

Fix another crash in checkProtectedRanges

Browse Source
This commit is contained in:
Nikolaj Schlej 2022-10-11 09:39:19 +02:00
parent 89a302e5d9
commit c3cedba150
1 changed files with 130 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/ffsparser.cpp
View File

@ -3456,12 +3456,18 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
if (!index.isValid()) if (!index.isValid())
return U_INVALID_PARAMETER; return U_INVALID_PARAMETER;
// QByteArray (Qt builds) supports obtaining data from invalid offsets in QByteArray,
// so mid() here doesn't throw anything for UEFITool, just returns ranges with all zeroes
// UByteArray (non-Qt builds) throws an exception that needs to be caught every time or the tools will crash.
// TODO: add sanity checks everythere so non-Qt UByteArray stuff don't need to throw
// Calculate digest for BG-protected ranges // Calculate digest for BG-protected ranges
UByteArray protectedParts; UByteArray protectedParts;
bool bgProtectedRangeFound = false; bool bgProtectedRangeFound = false;
try { try {
for (UINT32 i = 0; i < (UINT32)protectedRanges.size(); i++) { for (UINT32 i = 0; i < (UINT32)protectedRanges.size(); i++) {
if (protectedRanges[i].Type == PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB && protectedRanges[i].Size > 0) { if (protectedRanges[i].Type == PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB
&& protectedRanges[i].Size > 0) {
bgProtectedRangeFound = true; bgProtectedRangeFound = true;
if ((UINT64)protectedRanges[i].Offset >= addressDiff) { if ((UINT64)protectedRanges[i].Offset >= addressDiff) {
protectedRanges[i].Offset -= (UINT32)addressDiff; protectedRanges[i].Offset -= (UINT32)addressDiff;
@ -3532,6 +3538,7 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
msg(usprintf("%s: can't determine DXE volume offset, old AMI protected range hash can't be checked", __FUNCTION__), index); msg(usprintf("%s: can't determine DXE volume offset, old AMI protected range hash can't be checked", __FUNCTION__), index);
} }
else { else {
try {
protectedRanges[i].Offset = model->base(dxeRootVolumeIndex); protectedRanges[i].Offset = model->base(dxeRootVolumeIndex);
protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size); protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size);
@ -3546,6 +3553,10 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
markProtectedRangeRecursive(index, protectedRanges[i]); markProtectedRangeRecursive(index, protectedRanges[i]);
} }
catch(...) {
// Do nothing, this range is likely not found in the image
}
}
} }
} }
else if (protectedRanges[i].Type == PROTECTED_RANGE_INTEL_BOOT_GUARD_POST_IBB) { else if (protectedRanges[i].Type == PROTECTED_RANGE_INTEL_BOOT_GUARD_POST_IBB) {
@ -3559,6 +3570,7 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
msg(usprintf("%s: can't determine DXE volume offset, post-IBB protected range hash can't be checked", __FUNCTION__), index); msg(usprintf("%s: can't determine DXE volume offset, post-IBB protected range hash can't be checked", __FUNCTION__), index);
} }
else { else {
try {
protectedRanges[i].Offset = model->base(dxeRootVolumeIndex); protectedRanges[i].Offset = model->base(dxeRootVolumeIndex);
protectedRanges[i].Size = (UINT32)(model->header(dxeRootVolumeIndex).size() + model->body(dxeRootVolumeIndex).size() + model->tail(dxeRootVolumeIndex).size()); protectedRanges[i].Size = (UINT32)(model->header(dxeRootVolumeIndex).size() + model->body(dxeRootVolumeIndex).size() + model->tail(dxeRootVolumeIndex).size());
protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size); protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size);
@ -3600,10 +3612,14 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
markProtectedRangeRecursive(index, protectedRanges[i]); markProtectedRangeRecursive(index, protectedRanges[i]);
} }
catch(...) {
// Do nothing, this range is likely not found in the image
}
}
} }
} }
else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_AMI_V2) { else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_AMI_V2) {
if ((UINT64)protectedRanges[i].Offset >= addressDiff) { try {
protectedRanges[i].Offset -= (UINT32)addressDiff; protectedRanges[i].Offset -= (UINT32)addressDiff;
protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size); protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size);
@ -3617,13 +3633,15 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
} }
markProtectedRangeRecursive(index, protectedRanges[i]); markProtectedRangeRecursive(index, protectedRanges[i]);
} else { }
msg(usprintf("%s: suspicious AMI new BG protection offset", __FUNCTION__), index); catch(...) {
// Do nothing, this range is likely not found in the image
} }
} }
else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_PHOENIX else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_PHOENIX
&& protectedRanges[i].Size != 0 && protectedRanges[i].Size != 0xFFFFFFFF && protectedRanges[i].Size != 0 && protectedRanges[i].Size != 0xFFFFFFFF
&& protectedRanges[i].Offset != 0xFFFFFFFF) { && protectedRanges[i].Offset != 0xFFFFFFFF) {
try {
protectedRanges[i].Offset += (UINT32)protectedRegionsBase; protectedRanges[i].Offset += (UINT32)protectedRegionsBase;
protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size); protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size);
@ -3638,9 +3656,14 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
markProtectedRangeRecursive(index, protectedRanges[i]); markProtectedRangeRecursive(index, protectedRanges[i]);
} }
catch(...) {
// Do nothing, this range is likely not found in the image
}
}
else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_MICROSOFT_PMDA else if (protectedRanges[i].Type == PROTECTED_RANGE_VENDOR_HASH_MICROSOFT_PMDA
&& protectedRanges[i].Size != 0 && protectedRanges[i].Size != 0xFFFFFFFF && protectedRanges[i].Size != 0 && protectedRanges[i].Size != 0xFFFFFFFF
&& protectedRanges[i].Offset != 0 && protectedRanges[i].Offset != 0xFFFFFFFF) { && protectedRanges[i].Offset != 0 && protectedRanges[i].Offset != 0xFFFFFFFF) {
try {
protectedRanges[i].Offset -= (UINT32)addressDiff; protectedRanges[i].Offset -= (UINT32)addressDiff;
protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size); protectedParts = openedImage.mid(protectedRanges[i].Offset, protectedRanges[i].Size);
@ -3681,6 +3704,10 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
markProtectedRangeRecursive(index, protectedRanges[i]); markProtectedRangeRecursive(index, protectedRanges[i]);
} }
catch(...) {
// Do nothing, this range is likely not found in the image
}
}
} }
return U_SUCCESS; return U_SUCCESS;