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

Check that volumeHeader->ExtHeaderOffset is aligned to 4 bytes

Browse Source
This commit is contained in:
yeggor 2023-03-17 02:23:32 +04:00 committed by Nikolaj Schlej
parent 2b876e2cc3
commit d9e1fe5859
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ffsparser.cpp
View File

@ -1125,7 +1125,7 @@ USTATUS FfsParser::parseVolumeHeader(const UByteArray & volume, const UINT32 loc
bool msgInvalidChecksum = false; bool msgInvalidChecksum = false;
if (volumeHeader->HeaderLength < sizeof(EFI_FIRMWARE_VOLUME_HEADER)) { if (volumeHeader->HeaderLength < sizeof(EFI_FIRMWARE_VOLUME_HEADER)) {
msg(usprintf("%s: input volume header length %Xh (%u) is smaller than volume header size", __FUNCTION__, (UINT32)volumeHeader->HeaderLength, (UINT32)volumeHeader->HeaderLength)); msg(usprintf("%s: input volume header length %04Xh (%hu) is smaller than volume header size", __FUNCTION__, volumeHeader->HeaderLength, volumeHeader->HeaderLength));
return U_INVALID_VOLUME; return U_INVALID_VOLUME;
} }
UByteArray tempHeader((const char*)volumeHeader, volumeHeader->HeaderLength); UByteArray tempHeader((const char*)volumeHeader, volumeHeader->HeaderLength);
@ -1159,6 +1159,12 @@ USTATUS FfsParser::parseVolumeHeader(const UByteArray & volume, const UINT32 loc
(msgInvalidChecksum ? usprintf(", invalid, should be %04Xh", calculated) : UString(", valid")); (msgInvalidChecksum ? usprintf(", invalid, should be %04Xh", calculated) : UString(", valid"));
// Extended header present // Extended header present
// volumeHeader->ExtHeaderOffset should be aligned to 4 bytes
if (volumeHeader->ExtHeaderOffset % 4) {
msg(usprintf("%s: ExtHeaderOffset %04Xh (%hu) is not aligned by 4 bytes", __FUNCTION__, volumeHeader->ExtHeaderOffset, volumeHeader->ExtHeaderOffset));
return U_INVALID_VOLUME;
}
if (volumeHeader->Revision > 1 && volumeHeader->ExtHeaderOffset) { if (volumeHeader->Revision > 1 && volumeHeader->ExtHeaderOffset) {
if (volume.size() < volumeHeader->ExtHeaderOffset + sizeof(EFI_FIRMWARE_VOLUME_EXT_HEADER)) { if (volume.size() < volumeHeader->ExtHeaderOffset + sizeof(EFI_FIRMWARE_VOLUME_EXT_HEADER)) {
return U_INVALID_VOLUME; return U_INVALID_VOLUME;