Mirocom/EDK2-fork
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

SecurityPkg: Clarify Is800155Event

Browse Source 
The Event3 memory comparison is technically correct since the
definitions of the struct types are the same. The extended
bodies of the events are different. The Event2 size guard
for the Event3 comparison should be split to use the Event3
in its sizeof for better clarity.

The large single condition makes the function difficult to
understand, so the combined logic is split into different
conditional statements.

Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
[ardb: whitespace fixes]
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Dionna Glaze
2025-05-12 14:39:03 +00:00
committed by mergify[bot]
parent 9c38295325
commit 0bb4cf0228
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
View File

@@ -798,6 +798,7 @@ Tcg2GetEventLog (
@retval FALSE This is NOT a Tcg800155PlatformIdEvent.
**/
STATIC
BOOLEAN
Is800155Event (
IN VOID *NewEventHdr,
@@ -806,18 +807,26 @@ Is800155Event (
IN UINT32 NewEventSize
)
{
if ((((TCG_PCR_EVENT2_HDR *)NewEventHdr)->EventType == EV_NO_ACTION) &&
(NewEventSize >= sizeof (TCG_Sp800_155_PlatformId_Event2)) &&
((CompareMem (
NewEventData,
TCG_Sp800_155_PlatformId_Event2_SIGNATURE,
sizeof (TCG_Sp800_155_PlatformId_Event2_SIGNATURE) - 1
) == 0) ||
(CompareMem (
NewEventData,
TCG_Sp800_155_PlatformId_Event3_SIGNATURE,
sizeof (TCG_Sp800_155_PlatformId_Event3_SIGNATURE) - 1
) == 0)))
if (((TCG_PCR_EVENT2_HDR *)NewEventHdr)->EventType != EV_NO_ACTION) {
return FALSE;
}
if ((NewEventSize >= sizeof (TCG_Sp800_155_PlatformId_Event2)) &&
(CompareMem (
NewEventData,
TCG_Sp800_155_PlatformId_Event2_SIGNATURE,
sizeof (TCG_Sp800_155_PlatformId_Event2_SIGNATURE) - 1
) == 0))
{
return TRUE;
}
if ((NewEventSize >= sizeof (TCG_Sp800_155_PlatformId_Event3)) &&
(CompareMem (
NewEventData,
TCG_Sp800_155_PlatformId_Event3_SIGNATURE,
sizeof (TCG_Sp800_155_PlatformId_Event3_SIGNATURE) - 1
) == 0))
{
return TRUE;
}