tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-25 18:48:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

GenFv: Fixed corruption of FFS file after rebasing.

Browse Source
This commit is contained in:
Mikhail Krichanov 2023-10-06 12:56:36 +03:00 committed by MikhailKrichanov
parent 24a208db03
commit e1d0cd68e3
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BaseTools/Source/C/GenFv/GenFvInternalLib.c
View File

@ -3625,6 +3625,8 @@ Returns:
UINT32 FfsFileLength; UINT32 FfsFileLength;
UINTN FileOffset; UINTN FileOffset;
EFI_FFS_INTEGRITY_CHECK *IntegrityCheck; EFI_FFS_INTEGRITY_CHECK *IntegrityCheck;
UINT8 *AfterPePart;
UINT32 AfterPeSize;
Index = 0; Index = 0;
Cptr = NULL; Cptr = NULL;
@ -3876,6 +3878,24 @@ Returns:
} }
if (ImageFormat == UefiImageFormatUe) { if (ImageFormat == UefiImageFormatUe) {
if ((RebasedImageSize + sizeof (EFI_COMMON_SECTION_HEADER)) >= 0x00FFFFFFU) {
Error (NULL, 0, 4001, "Invalid", "rebased file is too large (%s)", FileName);
return EFI_UNSUPPORTED;
}
AfterPeSize = GetFfsFileLength (*FfsFile) - (FileOffset + SectPeSize);
AfterPePart = calloc (1, AfterPeSize);
if (AfterPePart == NULL) {
fprintf (stderr, "GenFv: Could not allocate memory for AfterPePart\n");
return EFI_OUT_OF_RESOURCES;
}
memmove (
AfterPePart,
(UINT8 *)((UINTN)(*FfsFile) + FileOffset + SectPeSize),
AfterPeSize
);
FfsFileLength = GetFfsFileLength (*FfsFile) - SectPeSize + RebasedImageSize; FfsFileLength = GetFfsFileLength (*FfsFile) - SectPeSize + RebasedImageSize;
*FfsFile = realloc (*FfsFile, FfsFileLength); *FfsFile = realloc (*FfsFile, FfsFileLength);
if (*FfsFile == NULL) { if (*FfsFile == NULL) {
@ -3884,12 +3904,23 @@ Returns:
} }
*FileSize = FfsFileLength; *FileSize = FfsFileLength;
CurrentPe32Section.CommonHeader = (EFI_COMMON_SECTION_HEADER *)((UINTN)(*FfsFile) + FileOffset - CurSecHdrSize);
CurrentPe32Section.CommonHeader->Size[0] = (UINT8)((RebasedImageSize + sizeof (EFI_COMMON_SECTION_HEADER)) & 0x000000FF);
CurrentPe32Section.CommonHeader->Size[1] = (UINT8)(((RebasedImageSize + sizeof (EFI_COMMON_SECTION_HEADER)) & 0x0000FF00) >> 8);
CurrentPe32Section.CommonHeader->Size[2] = (UINT8)(((RebasedImageSize + sizeof (EFI_COMMON_SECTION_HEADER)) & 0x00FF0000) >> 16);
memmove ( memmove (
(UINT8 *)((UINTN)(*FfsFile) + FileOffset), (UINT8 *)((UINTN)(*FfsFile) + FileOffset),
RebasedImage, RebasedImage,
RebasedImageSize RebasedImageSize
); );
memmove (
(UINT8 *)((UINTN)(*FfsFile) + FileOffset + RebasedImageSize),
AfterPePart,
AfterPeSize
);
if (FfsHeaderSize > sizeof(EFI_FFS_FILE_HEADER)) { if (FfsHeaderSize > sizeof(EFI_FFS_FILE_HEADER)) {
((EFI_FFS_FILE_HEADER2 *)(*FfsFile))->ExtendedSize = FfsFileLength; ((EFI_FFS_FILE_HEADER2 *)(*FfsFile))->ExtendedSize = FfsFileLength;
} else { } else {
@ -3908,7 +3939,8 @@ Returns:
IntegrityCheck->Checksum.File = 0; IntegrityCheck->Checksum.File = 0;
IntegrityCheck->Checksum.Header = CalculateChecksum8 ( IntegrityCheck->Checksum.Header = CalculateChecksum8 (
(UINT8 *)(*FfsFile), FfsHeaderSize); (UINT8 *)(*FfsFile), FfsHeaderSize
);
if ((*FfsFile)->Attributes & FFS_ATTRIB_CHECKSUM) { if ((*FfsFile)->Attributes & FFS_ATTRIB_CHECKSUM) {
// //
@ -3916,7 +3948,8 @@ Returns:
// //
IntegrityCheck->Checksum.File = CalculateChecksum8 ( IntegrityCheck->Checksum.File = CalculateChecksum8 (
(UINT8 *)(*FfsFile) + FfsHeaderSize, (UINT8 *)(*FfsFile) + FfsHeaderSize,
FfsFileLength - FfsHeaderSize); FfsFileLength - FfsHeaderSize
);
} else { } else {
IntegrityCheck->Checksum.File = FFS_FIXED_CHECKSUM; IntegrityCheck->Checksum.File = FFS_FIXED_CHECKSUM;
} }
@ -3978,7 +4011,9 @@ Returns:
UefiImageFileBuffer = NULL; UefiImageFileBuffer = NULL;
UefiImageFileSize = 0; UefiImageFileSize = 0;
free (SymbolsPathCpy); if (SymbolsPathCpy != NULL) {
free (SymbolsPathCpy);
}
} }
return EFI_SUCCESS; return EFI_SUCCESS;