Skip to content

Varint readfix r35.5.0 #110

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
gmahadevan wants to merge 2 commits into
base: r35.6.0-updates
Choose a base branch
from
Open

Varint readfix r35.5.0 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92cd5f9
fix: varint: read records per erase block and fix leak
gmahadevan Nov 6, 2024
9d0ad7f
fix: bug in block erase logic
gmahadevan Dec 10, 2024
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
78 changes: 44 additions & 34 deletions Silicon/NVIDIA/Drivers/FvbNorFlashDxe/VarIntCheck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ GetWriteOffset (
*Offset = BlockOffset;
break;
} else if (ReadBuf[0] == VAR_INT_VALID) {
ValidRecord = CurOffset;
ValidRecord = BlockOffset;
}

BlockOffset += This->MeasurementSize;
Expand All @@ -313,7 +313,7 @@ GetWriteOffset (
if ((ValidRecord == 0) || (NumPartitionBlocks == 1)) {
*Offset = This->PartitionByteOffset;
} else {
CurBlock = (ValidRecord / This->PartitionByteOffset);
CurBlock = (ValidRecord / This->BlockSize);
if (CurBlock == EndBlock) {
*Offset = This->PartitionByteOffset;
} else {
Expand Down Expand Up @@ -483,6 +483,8 @@ GetLastValidMeasurements (
UINT64 StartOffset;
UINT64 EndOffset;
UINT64 CurOffset;
UINT64 BlockOffset;
UINT64 BlockEnd;
UINT64 NumValidRecords;
UINT8 *ReadBuf;

Expand All @@ -499,50 +501,58 @@ GetLastValidMeasurements (
EndOffset = StartOffset + VarInt->PartitionSize;

CurOffset = StartOffset;
BlockOffset = CurOffset;
BlockEnd = BlockOffset + VarInt->BlockSize;
NumValidRecords = 0;
*NumRecords = 0;

while (CurOffset < EndOffset) {
Status = NorFlash->Read (
NorFlash,
CurOffset,
VarInt->MeasurementSize,
ReadBuf
);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"%a: NorFlash Read Failed at %lu offset %r\n",
__FUNCTION__,
CurOffset,
Status
));
goto ExitGetLastValidMeasuremets;
}

if ((ReadBuf[0] == VAR_INT_VALID) ||
(ReadBuf[0] == VAR_INT_PENDING))
{
NumValidRecords++;
if (NumValidRecords > MAX_VALID_RECORDS) {
while (BlockOffset < BlockEnd) {
Status = NorFlash->Read (
NorFlash,
BlockOffset,
VarInt->MeasurementSize,
ReadBuf
);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"%a: More than %d Valid measurements found %x\n",
"%a: NorFlash Read Failed at %lu offset %r\n",
__FUNCTION__,
MAX_VALID_RECORDS,
ReadBuf[0]
BlockOffset,
Status
));
Status = EFI_DEVICE_ERROR;
goto ExitGetLastValidMeasuremets;
} else {
DEBUG ((DEBUG_INFO, "Found Record at %lu Header %x\n", CurOffset, ReadBuf[0]));
CopyMem (Records[(NumValidRecords - 1)]->Measurement, ReadBuf, VarInt->MeasurementSize);
*NumRecords += 1;
Records[(NumValidRecords - 1)]->ByteOffset = CurOffset;
}

if ((ReadBuf[0] == VAR_INT_VALID) ||
(ReadBuf[0] == VAR_INT_PENDING))
{
NumValidRecords++;
if (NumValidRecords > MAX_VALID_RECORDS) {
DEBUG ((
DEBUG_ERROR,
"%a: More than %d Valid measurements found %x\n",
__FUNCTION__,
MAX_VALID_RECORDS,
ReadBuf[0]
));
Status = EFI_DEVICE_ERROR;
goto ExitGetLastValidMeasuremets;
} else {
DEBUG ((DEBUG_INFO, "Found Record at %lu Header %x\n", BlockOffset, ReadBuf[0]));
CopyMem (Records[(NumValidRecords - 1)]->Measurement, ReadBuf, VarInt->MeasurementSize);
*NumRecords += 1;
Records[(NumValidRecords - 1)]->ByteOffset = BlockOffset;
}
}

BlockOffset += VarInt->MeasurementSize;
}

CurOffset += VarInt->MeasurementSize;
CurOffset += VarInt->BlockSize;
BlockEnd += VarInt->BlockSize;
BlockOffset = CurOffset;
}

ExitGetLastValidMeasuremets:
Expand Down
22 changes: 9 additions & 13 deletions Silicon/NVIDIA/Library/NvVarIntLibrary/NvVarIntLibrary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,16 @@ MeasureBootVars (

DEBUG ((DEBUG_INFO, "Adding %s Size %u %p\n", BootOptionName, BootOptionSize, BootOptions[Index]));
HashApiUpdate (HashContext, BootOptions[Index], BootOptionSize);
FreePool (BootOptions[Index]);
}

ExitMeasureBootVars:

if (BootOptions != NULL) {
FreePool (BootOptions);
BootOptions = NULL;
}

if ((UpdatingBootOrder == TRUE)) {
BootOrder = NULL;
BootCount = 0;
Expand Down Expand Up @@ -598,7 +605,6 @@ ComputeVarMeasurement (
)
{
EFI_STATUS Status;
UINTN Index;

if (HashContext == NULL) {
HashContext = AllocateRuntimeZeroPool (HashApiGetContextSize ());
Expand All @@ -625,22 +631,12 @@ ComputeVarMeasurement (
Status = EFI_DEVICE_ERROR;
}

if ((BootCount != 0) && (BootOptions != NULL)) {
for (Index = 0; Index < BootCount; Index++) {
if (BootOptions[Index] != NULL) {
FreePool (BootOptions[Index]);
}
}

FreePool (BootOptions);
BootCount = 0;
BootOptions = NULL;
}

if (BootOrder != NULL) {
FreePool (BootOrder);
}

BootCount = 0;

Status = EFI_SUCCESS;

ExitComputeVarMeasurement:
Expand Down