sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checks the TE image before use it.

Browse Source 
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14024 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10
2012-12-26 04:33:15 +00:00
parent c84f048224
commit bf29dc16e6
2 changed files with 198 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
MdePkg/Library/BasePeCoffLib/BasePeCoff.c
View File

@ -29,6 +29,23 @@
#include "BasePeCoffLibInternals.h" #include "BasePeCoffLibInternals.h"
/**
Adjust some fields in section header for TE image.
@param SectionHeader Pointer to the section header.
@param TeStrippedOffset Size adjust for the TE image.
**/
VOID
PeCoffLoaderAdjustOffsetForTeImage (
EFI_IMAGE_SECTION_HEADER *SectionHeader,
UINT32 TeStrippedOffset
)
{
SectionHeader->VirtualAddress -= TeStrippedOffset;
SectionHeader->PointerToRawData -= TeStrippedOffset;
}
/** /**
Retrieves the magic value from the PE/COFF header. Retrieves the magic value from the PE/COFF header.
@ -157,6 +174,50 @@ PeCoffLoaderGetPeHeader (
ImageContext->SectionAlignment = 0; ImageContext->SectionAlignment = 0;
ImageContext->SizeOfHeaders = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN)Hdr.Te->BaseOfCode - (UINTN)Hdr.Te->StrippedSize; ImageContext->SizeOfHeaders = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN)Hdr.Te->BaseOfCode - (UINTN)Hdr.Te->StrippedSize;
//
// Check the StrippedSize.
//
if (sizeof (EFI_TE_IMAGE_HEADER) >= (UINT32)Hdr.Te->StrippedSize) {
ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;
return RETURN_UNSUPPORTED;
}
//
// Check the SizeOfHeaders field.
//
if (Hdr.Te->BaseOfCode <= Hdr.Te->StrippedSize) {
ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;
return RETURN_UNSUPPORTED;
}
//
// Read last byte of Hdr.Te->SizeOfHeaders from the file.
//
Size = 1;
ReadSize = Size;
Status = ImageContext->ImageRead (
ImageContext->Handle,
ImageContext->SizeOfHeaders - 1,
&Size,
&BufferData
);
if (RETURN_ERROR (Status) || (Size != ReadSize)) {
ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
if (Size != ReadSize) {
Status = RETURN_UNSUPPORTED;
}
return Status;
}
//
// TE Image Data Directory Entry size is non-zero, but the Data Directory Virtual Address is zero.
// This case is not a valid TE image.
//
if ((Hdr.Te->DataDirectory[0].Size != 0 && Hdr.Te->DataDirectory[0].VirtualAddress == 0) ||
(Hdr.Te->DataDirectory[1].Size != 0 && Hdr.Te->DataDirectory[1].VirtualAddress == 0)) {
ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;
return RETURN_UNSUPPORTED;
}
} else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) { } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {
ImageContext->IsTeImage = FALSE; ImageContext->IsTeImage = FALSE;
ImageContext->Machine = Hdr.Pe32->FileHeader.Machine; ImageContext->Machine = Hdr.Pe32->FileHeader.Machine;
@ -417,6 +478,13 @@ PeCoffLoaderGetPeHeader (
return Status; return Status;
} }
//
// Adjust some field in Section Header for TE image.
//
if (ImageContext->IsTeImage) {
PeCoffLoaderAdjustOffsetForTeImage (&SectionHeader, (UINT32)Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER));
}
if (SectionHeader.SizeOfRawData > 0) { if (SectionHeader.SizeOfRawData > 0) {
// //
// Section data should bigger than the Pe header. // Section data should bigger than the Pe header.
@ -514,6 +582,7 @@ PeCoffLoaderGetImageInfo (
EFI_IMAGE_DEBUG_DIRECTORY_ENTRY DebugEntry; EFI_IMAGE_DEBUG_DIRECTORY_ENTRY DebugEntry;
UINT32 NumberOfRvaAndSizes; UINT32 NumberOfRvaAndSizes;
UINT16 Magic; UINT16 Magic;
UINT32 TeStrippedOffset;
if (ImageContext == NULL) { if (ImageContext == NULL) {
return RETURN_INVALID_PARAMETER; return RETURN_INVALID_PARAMETER;
@ -535,6 +604,7 @@ PeCoffLoaderGetImageInfo (
// Retrieve the base address of the image // Retrieve the base address of the image
// //
if (!(ImageContext->IsTeImage)) { if (!(ImageContext->IsTeImage)) {
TeStrippedOffset = 0;
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
// //
// Use PE32 offset // Use PE32 offset
@ -547,7 +617,8 @@ PeCoffLoaderGetImageInfo (
ImageContext->ImageAddress = Hdr.Pe32Plus->OptionalHeader.ImageBase; ImageContext->ImageAddress = Hdr.Pe32Plus->OptionalHeader.ImageBase;
} }
} else { } else {
ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER)); TeStrippedOffset = (UINT32)Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER);
ImageContext->ImageAddress = (PHYSICAL_ADDRESS)(Hdr.Te->ImageBase + TeStrippedOffset);
} }
// //
@ -582,15 +653,6 @@ PeCoffLoaderGetImageInfo (
ImageContext->RelocationsStripped = FALSE; ImageContext->RelocationsStripped = FALSE;
} }
//
// TE Image Relocation Data Directory Entry size is non-zero, but the Relocation Data Directory Virtual Address is zero.
// This case is not a valid TE image.
//
if ((ImageContext->IsTeImage) && (Hdr.Te->DataDirectory[0].Size != 0) && (Hdr.Te->DataDirectory[0].VirtualAddress == 0)) {
ImageContext->ImageError = IMAGE_ERROR_UNSUPPORTED;
return RETURN_UNSUPPORTED;
}
if (!(ImageContext->IsTeImage)) { if (!(ImageContext->IsTeImage)) {
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
// //
@ -723,9 +785,8 @@ PeCoffLoaderGetImageInfo (
DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) { DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) {
DebugDirectoryEntryFileOffset = DebugDirectoryEntryRva - DebugDirectoryEntryFileOffset = DebugDirectoryEntryRva -
SectionHeader.VirtualAddress + SectionHeader.VirtualAddress +
SectionHeader.PointerToRawData + SectionHeader.PointerToRawData -
sizeof (EFI_TE_IMAGE_HEADER) - TeStrippedOffset;
Hdr.Te->StrippedSize;
// //
// File offset of the debug directory was found, if this is not the last // File offset of the debug directory was found, if this is not the last
@ -749,7 +810,7 @@ PeCoffLoaderGetImageInfo (
// Section Table. // Section Table.
// //
if ((++Index) == (UINTN)Hdr.Te->NumberOfSections) { if ((++Index) == (UINTN)Hdr.Te->NumberOfSections) {
ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize); ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) - TeStrippedOffset;
} }
SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER); SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
@ -792,7 +853,8 @@ PeCoffLoaderGetImageInfo (
Converts an image address to the loaded address. Converts an image address to the loaded address.
@param ImageContext The context of the image being loaded. @param ImageContext The context of the image being loaded.
@param Address The relative virtual address to be converted to the loaded address. @param Address The address to be converted to the loaded address.
@param TeStrippedOffset Stripped offset for TE image.
@return The converted address or NULL if the address can not be converted. @return The converted address or NULL if the address can not be converted.
@ -800,18 +862,19 @@ PeCoffLoaderGetImageInfo (
VOID * VOID *
PeCoffLoaderImageAddress ( PeCoffLoaderImageAddress (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext, IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,
IN UINTN Address IN UINTN Address,
IN UINTN TeStrippedOffset
) )
{ {
// //
// Make sure that Address and ImageSize is correct for the loaded image. // Make sure that Address and ImageSize is correct for the loaded image.
// //
if (Address >= ImageContext->ImageSize) { if (Address >= ImageContext->ImageSize + TeStrippedOffset) {
ImageContext->ImageError = IMAGE_ERROR_INVALID_IMAGE_ADDRESS; ImageContext->ImageError = IMAGE_ERROR_INVALID_IMAGE_ADDRESS;
return NULL; return NULL;
} }
return (CHAR8 *)((UINTN) ImageContext->ImageAddress + Address); return (CHAR8 *)((UINTN) ImageContext->ImageAddress + Address - TeStrippedOffset);
} }
/** /**
@ -867,6 +930,7 @@ PeCoffLoaderRelocateImage (
PHYSICAL_ADDRESS BaseAddress; PHYSICAL_ADDRESS BaseAddress;
UINT32 NumberOfRvaAndSizes; UINT32 NumberOfRvaAndSizes;
UINT16 Magic; UINT16 Magic;
UINT32 TeStrippedOffset;
ASSERT (ImageContext != NULL); ASSERT (ImageContext != NULL);
@ -897,7 +961,7 @@ PeCoffLoaderRelocateImage (
if (!(ImageContext->IsTeImage)) { if (!(ImageContext->IsTeImage)) {
Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageContext->ImageAddress + ImageContext->PeCoffHeaderOffset); Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageContext->ImageAddress + ImageContext->PeCoffHeaderOffset);
TeStrippedOffset = 0;
Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr); Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
@ -930,12 +994,28 @@ PeCoffLoaderRelocateImage (
// is present in the image. You have to check the NumberOfRvaAndSizes in // is present in the image. You have to check the NumberOfRvaAndSizes in
// the optional header to verify a desired directory entry is there. // the optional header to verify a desired directory entry is there.
// //
if ((NumberOfRvaAndSizes < EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC)) {
RelocDir = NULL;
}
} else {
Hdr.Te = (EFI_TE_IMAGE_HEADER *)(UINTN)(ImageContext->ImageAddress);
TeStrippedOffset = (UINT32)Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER);
Adjust = (UINT64) (BaseAddress - (Hdr.Te->ImageBase + TeStrippedOffset));
if (Adjust != 0) {
Hdr.Te->ImageBase = (UINT64) (BaseAddress - TeStrippedOffset);
}
if ((NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) && (RelocDir->Size > 0)) { //
RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress); // Find the relocation block
RelocBaseEnd = PeCoffLoaderImageAddress ( //
ImageContext, RelocDir = &Hdr.Te->DataDirectory[0];
RelocDir->VirtualAddress + RelocDir->Size - 1 }
if ((RelocDir != NULL) && (RelocDir->Size > 0)) {
RelocBase = (EFI_IMAGE_BASE_RELOCATION *) PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress, TeStrippedOffset);
RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) PeCoffLoaderImageAddress (ImageContext,
RelocDir->VirtualAddress + RelocDir->Size - 1,
TeStrippedOffset
); );
if (RelocBase == NULL || RelocBaseEnd == NULL) { if (RelocBase == NULL || RelocBaseEnd == NULL) {
return RETURN_LOAD_ERROR; return RETURN_LOAD_ERROR;
@ -946,32 +1026,6 @@ PeCoffLoaderRelocateImage (
// //
RelocBase = RelocBaseEnd = NULL; RelocBase = RelocBaseEnd = NULL;
} }
} else {
Hdr.Te = (EFI_TE_IMAGE_HEADER *)(UINTN)(ImageContext->ImageAddress);
Adjust = (UINT64) (BaseAddress - Hdr.Te->StrippedSize + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->ImageBase);
if (Adjust != 0) {
Hdr.Te->ImageBase = (UINT64) (BaseAddress - Hdr.Te->StrippedSize + sizeof (EFI_TE_IMAGE_HEADER));
}
//
// Find the relocation block
//
RelocDir = &Hdr.Te->DataDirectory[0];
if (RelocDir->Size > 0) {
RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
ImageContext->ImageAddress +
RelocDir->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
Hdr.Te->StrippedSize
);
RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
} else {
//
// Set base and end to bypass processing below.
//
RelocBase = RelocBaseEnd = NULL;
}
}
// //
// If Adjust is not zero, then apply fix ups to the image // If Adjust is not zero, then apply fix ups to the image
@ -993,19 +1047,10 @@ PeCoffLoaderRelocateImage (
} }
RelocEnd = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock); RelocEnd = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock);
FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress, TeStrippedOffset);
if (!(ImageContext->IsTeImage)) {
FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
if (FixupBase == NULL) { if (FixupBase == NULL) {
return RETURN_LOAD_ERROR; return RETURN_LOAD_ERROR;
} }
} else {
FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
RelocBase->VirtualAddress +
sizeof(EFI_TE_IMAGE_HEADER) -
Hdr.Te->StrippedSize
);
}
// //
// Run this relocation record // Run this relocation record
@ -1154,7 +1199,7 @@ PeCoffLoaderLoadImage (
EFI_IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry; EFI_IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry;
CHAR16 *String; CHAR16 *String;
UINT32 Offset; UINT32 Offset;
UINT32 TeStrippedOffset;
ASSERT (ImageContext != NULL); ASSERT (ImageContext != NULL);
@ -1241,6 +1286,7 @@ PeCoffLoaderLoadImage (
Hdr.Pe32->FileHeader.SizeOfOptionalHeader Hdr.Pe32->FileHeader.SizeOfOptionalHeader
); );
NumberOfSections = (UINTN) (Hdr.Pe32->FileHeader.NumberOfSections); NumberOfSections = (UINTN) (Hdr.Pe32->FileHeader.NumberOfSections);
TeStrippedOffset = 0;
} else { } else {
Status = ImageContext->ImageRead ( Status = ImageContext->ImageRead (
ImageContext->Handle, ImageContext->Handle,
@ -1250,13 +1296,12 @@ PeCoffLoaderLoadImage (
); );
Hdr.Te = (EFI_TE_IMAGE_HEADER *)(UINTN)(ImageContext->ImageAddress); Hdr.Te = (EFI_TE_IMAGE_HEADER *)(UINTN)(ImageContext->ImageAddress);
FirstSection = (EFI_IMAGE_SECTION_HEADER *) ( FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
(UINTN)ImageContext->ImageAddress + (UINTN)ImageContext->ImageAddress +
sizeof(EFI_TE_IMAGE_HEADER) sizeof(EFI_TE_IMAGE_HEADER)
); );
NumberOfSections = (UINTN) (Hdr.Te->NumberOfSections); NumberOfSections = (UINTN) (Hdr.Te->NumberOfSections);
TeStrippedOffset = (UINT32) Hdr.Te->StrippedSize - sizeof (EFI_TE_IMAGE_HEADER);
} }
if (RETURN_ERROR (Status)) { if (RETURN_ERROR (Status)) {
@ -1280,11 +1325,8 @@ PeCoffLoaderLoadImage (
// //
// Compute sections address // Compute sections address
// //
Base = PeCoffLoaderImageAddress (ImageContext, Section->VirtualAddress); Base = PeCoffLoaderImageAddress (ImageContext, Section->VirtualAddress, TeStrippedOffset);
End = PeCoffLoaderImageAddress ( End = PeCoffLoaderImageAddress (ImageContext, Section->VirtualAddress + Section->Misc.VirtualSize - 1, TeStrippedOffset);
ImageContext,
Section->VirtualAddress + Section->Misc.VirtualSize - 1
);
// //
// If the size of the section is non-zero and the base address or end address resolved to 0, then fail. // If the size of the section is non-zero and the base address or end address resolved to 0, then fail.
@ -1294,28 +1336,13 @@ PeCoffLoaderLoadImage (
return RETURN_LOAD_ERROR; return RETURN_LOAD_ERROR;
} }
if (ImageContext->IsTeImage) {
Base = (CHAR8 *)((UINTN) Base + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN)Hdr.Te->StrippedSize);
End = (CHAR8 *)((UINTN) End + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN)Hdr.Te->StrippedSize);
}
if (Section->SizeOfRawData > 0) { if (Section->SizeOfRawData > 0) {
if (!(ImageContext->IsTeImage)) {
Status = ImageContext->ImageRead ( Status = ImageContext->ImageRead (
ImageContext->Handle, ImageContext->Handle,
Section->PointerToRawData, Section->PointerToRawData - TeStrippedOffset,
&Size, &Size,
Base Base
); );
} else {
Status = ImageContext->ImageRead (
ImageContext->Handle,
Section->PointerToRawData + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN)Hdr.Te->StrippedSize,
&Size,
Base
);
}
if (RETURN_ERROR (Status)) { if (RETURN_ERROR (Status)) {
ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ; ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
return Status; return Status;
@ -1350,7 +1377,8 @@ PeCoffLoaderLoadImage (
// //
ImageContext->EntryPoint = (PHYSICAL_ADDRESS)(UINTN)PeCoffLoaderImageAddress ( ImageContext->EntryPoint = (PHYSICAL_ADDRESS)(UINTN)PeCoffLoaderImageAddress (
ImageContext, ImageContext,
(UINTN)Hdr.Pe32->OptionalHeader.AddressOfEntryPoint (UINTN)Hdr.Pe32->OptionalHeader.AddressOfEntryPoint,
0
); );
} else { } else {
// //
@ -1358,15 +1386,15 @@ PeCoffLoaderLoadImage (
// //
ImageContext->EntryPoint = (PHYSICAL_ADDRESS)(UINTN)PeCoffLoaderImageAddress ( ImageContext->EntryPoint = (PHYSICAL_ADDRESS)(UINTN)PeCoffLoaderImageAddress (
ImageContext, ImageContext,
(UINTN)Hdr.Pe32Plus->OptionalHeader.AddressOfEntryPoint (UINTN)Hdr.Pe32Plus->OptionalHeader.AddressOfEntryPoint,
0
); );
} }
} else { } else {
ImageContext->EntryPoint = (PHYSICAL_ADDRESS) ( ImageContext->EntryPoint = (PHYSICAL_ADDRESS)(UINTN)PeCoffLoaderImageAddress (
(UINTN)ImageContext->ImageAddress + ImageContext,
(UINTN)Hdr.Te->AddressOfEntryPoint + (UINTN)Hdr.Te->AddressOfEntryPoint,
(UINTN)sizeof(EFI_TE_IMAGE_HEADER) - TeStrippedOffset
(UINTN)Hdr.Te->StrippedSize
); );
} }
@ -1411,21 +1439,16 @@ PeCoffLoaderLoadImage (
// Load the Codeview information if present // Load the Codeview information if present
// //
if (ImageContext->DebugDirectoryEntryRva != 0) { if (ImageContext->DebugDirectoryEntryRva != 0) {
if (!(ImageContext->IsTeImage)) {
DebugEntry = PeCoffLoaderImageAddress ( DebugEntry = PeCoffLoaderImageAddress (
ImageContext, ImageContext,
ImageContext->DebugDirectoryEntryRva ImageContext->DebugDirectoryEntryRva,
); TeStrippedOffset
} else {
DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
ImageContext->ImageAddress +
ImageContext->DebugDirectoryEntryRva +
sizeof(EFI_TE_IMAGE_HEADER) -
Hdr.Te->StrippedSize
); );
if (DebugEntry == NULL) {
ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
return RETURN_LOAD_ERROR;
} }
if (DebugEntry != NULL) {
TempDebugEntryRva = DebugEntry->RVA; TempDebugEntryRva = DebugEntry->RVA;
if (DebugEntry->RVA == 0 && DebugEntry->FileOffset != 0) { if (DebugEntry->RVA == 0 && DebugEntry->FileOffset != 0) {
Section--; Section--;
@ -1437,35 +1460,17 @@ PeCoffLoaderLoadImage (
} }
if (TempDebugEntryRva != 0) { if (TempDebugEntryRva != 0) {
if (!(ImageContext->IsTeImage)) { ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva, TeStrippedOffset);
ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
} else {
ImageContext->CodeView = (VOID *)(
(UINTN)ImageContext->ImageAddress +
(UINTN)TempDebugEntryRva +
(UINTN)sizeof (EFI_TE_IMAGE_HEADER) -
(UINTN) Hdr.Te->StrippedSize
);
}
if (ImageContext->CodeView == NULL) { if (ImageContext->CodeView == NULL) {
ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ; ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
return RETURN_LOAD_ERROR; return RETURN_LOAD_ERROR;
} }
if (DebugEntry->RVA == 0) { if (DebugEntry->RVA == 0) {
Size = DebugEntry->SizeOfData; Size = DebugEntry->SizeOfData;
if (!(ImageContext->IsTeImage)) {
Status = ImageContext->ImageRead ( Status = ImageContext->ImageRead (
ImageContext->Handle, ImageContext->Handle,
DebugEntry->FileOffset, DebugEntry->FileOffset - TeStrippedOffset,
&Size,
ImageContext->CodeView
);
} else {
Status = ImageContext->ImageRead (
ImageContext->Handle,
DebugEntry->FileOffset + sizeof (EFI_TE_IMAGE_HEADER) - Hdr.Te->StrippedSize,
&Size, &Size,
ImageContext->CodeView ImageContext->CodeView
); );
@ -1474,7 +1479,6 @@ PeCoffLoaderLoadImage (
// Because now we maintain TE header fields unfixed, this field will also remain as they are // Because now we maintain TE header fields unfixed, this field will also remain as they are
// in original PE image. // in original PE image.
// //
}
if (RETURN_ERROR (Status)) { if (RETURN_ERROR (Status)) {
ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ; ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
@ -1514,7 +1518,6 @@ PeCoffLoaderLoadImage (
} }
} }
} }
}
// //
// Get Image's HII resource section // Get Image's HII resource section
@ -1536,7 +1539,7 @@ PeCoffLoaderLoadImage (
} }
if (NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE && DirectoryEntry->Size != 0) { if (NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE && DirectoryEntry->Size != 0) {
Base = PeCoffLoaderImageAddress (ImageContext, DirectoryEntry->VirtualAddress); Base = PeCoffLoaderImageAddress (ImageContext, DirectoryEntry->VirtualAddress, 0);
if (Base != NULL) { if (Base != NULL) {
ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) Base; ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) Base;
Offset = sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) * Offset = sizeof (EFI_IMAGE_RESOURCE_DIRECTORY) + sizeof (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY) *
@ -1611,7 +1614,7 @@ PeCoffLoaderLoadImage (
return RETURN_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
ResourceDataEntry = (EFI_IMAGE_RESOURCE_DATA_ENTRY *) (Base + ResourceDirectoryEntry->u2.OffsetToData); ResourceDataEntry = (EFI_IMAGE_RESOURCE_DATA_ENTRY *) (Base + ResourceDirectoryEntry->u2.OffsetToData);
ImageContext->HiiResourceData = (PHYSICAL_ADDRESS) (UINTN) PeCoffLoaderImageAddress (ImageContext, ResourceDataEntry->OffsetToData); ImageContext->HiiResourceData = (PHYSICAL_ADDRESS) (UINTN) PeCoffLoaderImageAddress (ImageContext, ResourceDataEntry->OffsetToData, 0);
break; break;
} }
} }

4
MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
View File

@ -118,6 +118,7 @@ PeCoffLoaderGetPeHeader (
@param ImageContext The context of the image being loaded. @param ImageContext The context of the image being loaded.
@param Address The address to be converted to the loaded address. @param Address The address to be converted to the loaded address.
@param TeStrippedOffset Stripped offset for TE image.
@return The converted address or NULL if the address can not be converted. @return The converted address or NULL if the address can not be converted.
@ -125,7 +126,8 @@ PeCoffLoaderGetPeHeader (
VOID * VOID *
PeCoffLoaderImageAddress ( PeCoffLoaderImageAddress (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext, IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext,
IN UINTN Address IN UINTN Address,
IN UINTN TeStrippedOffset
); );
#endif #endif