Skip to content

fix: add buffer-length check in MeasureBootPeCoff.c #374

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
orbisai0security wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add buffer-length check in MeasureBootPeCoff.c #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion tools/mrtool/cgo/MeasureBootPeCoff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,14 @@ Tcg2DxeImageRead (
)
{
UINTN EndPosition;
UINTN OriginalSize;

if (FileHandle == NULL || ReadSize == NULL || Buffer == NULL) {
return EFI_INVALID_PARAMETER;
}

OriginalSize = *ReadSize;

if (MAX_ADDRESS - FileOffset < *ReadSize) {
return EFI_INVALID_PARAMETER;
}
Expand All @@ -93,6 +96,10 @@ Tcg2DxeImageRead (
*ReadSize = 0;
}

if (*ReadSize > OriginalSize) {
*ReadSize = OriginalSize;
}

memcpy (Buffer, (UINT8 *)((UINTN) FileHandle + FileOffset), *ReadSize);

return EFI_SUCCESS;
Expand Down Expand Up @@ -928,7 +935,7 @@ LoadPeImage (
}
uint64_t file_size = st.st_size;

*buf = (uint8_t *)malloc(sizeof(uint8_t) * file_size);
*buf = (uint8_t *)malloc(file_size);
if (!*buf) {
printf("Failed to allocate memory\n");
return -1;
Expand Down