mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-23 03:27:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve parsing error detection for DVARs

Browse source
This commit is contained in:
Nikolaj Schlej 2025-04-28 17:28:06 +07:00
parent c235533f22
commit 7237a29b17
1 changed files with 111 additions and 94 deletions

205
common/ffsparser.cpp
View file

@ -1171,127 +1171,144 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
break; break;
} }
// This is a normal entry // Check entry format to be known
bool formatKnown = true;
// Check state to be known // Check state to be known
if (entry->state() != DVAR_ENTRY_STATE_STORING && if (entry->state() != DVAR_ENTRY_STATE_STORING &&
entry->state() != DVAR_ENTRY_STATE_STORED && entry->state() != DVAR_ENTRY_STATE_STORED &&
entry->state() != DVAR_ENTRY_STATE_DELETING && entry->state() != DVAR_ENTRY_STATE_DELETING &&
entry->state() != DVAR_ENTRY_STATE_DELETED){ entry->state() != DVAR_ENTRY_STATE_DELETED){
// TODO: Add the rest as padding, as we encountered an unexpected entry and can't guarantee that the rest got parsed correctly formatKnown = false;
msg(usprintf("%s: DVAR entry with unknown state %02X", __FUNCTION__, entry->state()), headerIndex);
} }
// Check flags to be known // Check flags to be known
if (entry->flags() != DVAR_ENTRY_FLAG_NAME_ID && if (entry->flags() != DVAR_ENTRY_FLAG_NAME_ID &&
entry->flags() != DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID) { entry->flags() != DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID) {
// TODO: Add the rest as padding, as we encountered an unexpected entry and can't guarantee that the rest got parsed correctly formatKnown = false;
msg(usprintf("%s: DVAR entry with unknown flags %02X", __FUNCTION__, entry->flags()), headerIndex);
} }
// Check type to be known // Check type to be known
if (entry->type() != DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8 && if (entry->type() != DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8 &&
entry->type() != DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8 && entry->type() != DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8 &&
entry->type() != DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) { entry->type() != DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) {
// TODO: Add the rest as padding, as we encountered an unexpected entry and can't guarantee that the rest got parsed correctly formatKnown = false;
msg(usprintf("%s: DVAR entry with unknown type %02X", __FUNCTION__, entry->type()), headerIndex);
} }
UINT32 headerSize; // This is an unknown entry
UINT32 bodySize; if (!formatKnown) {
UINT32 entrySize; // No way to continue from here, because we can not be sure that the rest of the store got parsed correctly
UINT32 nameId; UByteArray padding = data.mid(entryOffset, storeSize - entryOffset);
UINT8 subtype;
UString text;
// TODO: find a Dell image with NameUtf8 entries
// NamespaceGUID entry
if (entry->flags() == DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID) {
// State of this variable only applies to the NameId part, not the NamespaceGuid part
// This kind of variables with deleted state till need to be shown as valid
subtype = Subtypes::NamespaceGuidDvarEntry;
EFI_GUID guid = *(const EFI_GUID*)(entry->namespace_guid().c_str());
headerSize = sizeof(DVAR_ENTRY_HEADER) + sizeof(EFI_GUID);
if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8) {
nameId = entry->name_id_8();
bodySize = entry->len_data_8();
headerSize += sizeof(UINT8) + sizeof(UINT8);
}
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8) {
nameId = entry->name_id_16();
bodySize = entry->len_data_8();
headerSize += sizeof(UINT16) + sizeof(UINT8);
}
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) {
nameId = entry->name_id_16();
bodySize = entry->len_data_16();
headerSize += sizeof(UINT16) + sizeof(UINT16);
}
entrySize = headerSize + bodySize; // Get info
header = dvar.mid(entryOffset, headerSize); name = UString("Padding");
body = dvar.mid(entryOffset + headerSize, bodySize); info = usprintf("Full size: %Xh (%u)", (UINT32)padding.size(), (UINT32)padding.size());
name = usprintf("%X:%X", entry->namespace_id(), nameId); // Add tree item
text = guidToUString(guid); model->addItem(entryOffset, Types::Padding, getPaddingType(padding), name, UString(), info, UByteArray(), padding, UByteArray(), Fixed, headerIndex);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(),
(UINT32)body.size(), (UINT32)body.size(),
entry->state(),
entry->flags(),
entry->type(),
entry->namespace_id(),
nameId)
+ UString("NamespaceGuid: ") + guidToUString(guid, false);
} }
// NameId entry // This is a normal entry
else { else {
subtype = Subtypes::NameIdDvarEntry; UINT32 headerSize;
headerSize = sizeof(DVAR_ENTRY_HEADER); UINT32 bodySize;
if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8) { UINT32 entrySize;
nameId = entry->name_id_8(); UINT32 nameId;
bodySize = entry->len_data_8(); UINT8 subtype;
headerSize += sizeof(UINT8) + sizeof(UINT8); UString text;
// NamespaceGUID entry
if (entry->flags() == DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID) {
// State of this variable only applies to the NameId part, not the NamespaceGuid part
// This kind of variables with deleted state till need to be shown as valid
subtype = Subtypes::NamespaceGuidDvarEntry;
EFI_GUID guid = *(const EFI_GUID*)(entry->namespace_guid().c_str());
headerSize = sizeof(DVAR_ENTRY_HEADER) + sizeof(EFI_GUID);
if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8) {
nameId = entry->name_id_8();
bodySize = entry->len_data_8();
headerSize += sizeof(UINT8) + sizeof(UINT8);
}
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8) {
nameId = entry->name_id_16();
bodySize = entry->len_data_8();
headerSize += sizeof(UINT16) + sizeof(UINT8);
}
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) {
nameId = entry->name_id_16();
bodySize = entry->len_data_16();
headerSize += sizeof(UINT16) + sizeof(UINT16);
}
entrySize = headerSize + bodySize;
header = dvar.mid(entryOffset, headerSize);
body = dvar.mid(entryOffset + headerSize, bodySize);
name = usprintf("%X:%X", entry->namespace_id(), nameId);
text = guidToUString(guid);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(),
(UINT32)body.size(), (UINT32)body.size(),
entry->state(),
entry->flags(),
entry->type(),
entry->namespace_id(),
nameId)
+ UString("NamespaceGuid: ") + guidToUString(guid, false);
} }
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8) { // NameId entry
nameId = entry->name_id_16(); else {
bodySize = entry->len_data_8(); subtype = Subtypes::NameIdDvarEntry;
headerSize += sizeof(UINT16) + sizeof(UINT8); headerSize = sizeof(DVAR_ENTRY_HEADER);
} if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_8_DATA_SIZE_8) {
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) { nameId = entry->name_id_8();
nameId = entry->name_id_16(); bodySize = entry->len_data_8();
bodySize = entry->len_data_16(); headerSize += sizeof(UINT8) + sizeof(UINT8);
headerSize += sizeof(UINT16) + sizeof(UINT16); }
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_8) {
nameId = entry->name_id_16();
bodySize = entry->len_data_8();
headerSize += sizeof(UINT16) + sizeof(UINT8);
}
else if (entry->type() == DVAR_ENTRY_TYPE_NAME_ID_16_DATA_SIZE_16) {
nameId = entry->name_id_16();
bodySize = entry->len_data_16();
headerSize += sizeof(UINT16) + sizeof(UINT16);
}
entrySize = headerSize + bodySize;
header = dvar.mid(entryOffset, headerSize);
body = dvar.mid(entryOffset + headerSize, bodySize);
name = usprintf("%X:%X", entry->namespace_id(), nameId);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(),
(UINT32)body.size(), (UINT32)body.size(),
entry->state(),
entry->flags(),
entry->type(),
entry->namespace_id(),
nameId);
} }
entrySize = headerSize + bodySize; // Mark NameId entries that are not stored as Invalid
header = dvar.mid(entryOffset, headerSize); if (entry->flags() != DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID &&
body = dvar.mid(entryOffset + headerSize, bodySize); (entry->state() == DVAR_ENTRY_STATE_STORING ||
name = usprintf("%X:%X", entry->namespace_id(), nameId);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(),
(UINT32)body.size(), (UINT32)body.size(),
entry->state(),
entry->flags(),
entry->type(),
entry->namespace_id(),
nameId);
}
// Mark NameId entries that are not stored as Invalid
if (entry->flags() != DVAR_ENTRY_FLAG_NAME_ID + DVAR_ENTRY_FLAG_NAMESPACE_GUID &&
(entry->state() == DVAR_ENTRY_STATE_STORING ||
entry->state() == DVAR_ENTRY_STATE_DELETING || entry->state() == DVAR_ENTRY_STATE_DELETING ||
entry->state() == DVAR_ENTRY_STATE_DELETED)) { entry->state() == DVAR_ENTRY_STATE_DELETED)) {
subtype = Subtypes::InvalidDvarEntry; subtype = Subtypes::InvalidDvarEntry;
name = UString("Invalid"); name = UString("Invalid");
text.clear(); text.clear();
}
// Add tree item
model->addItem(entryOffset, Types::DellDvarEntry, subtype, name, text, info, header, body, UByteArray(), Fixed, headerIndex);
entryOffset += entrySize;
} }
// Add tree item
model->addItem(entryOffset, Types::DellDvarEntry, subtype, name, text, info, header, body, UByteArray(), Fixed, headerIndex);
entryOffset += entrySize;
} }
} }
catch (...) { catch (...) {