tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the issue that accessing for unaligned address break IPF 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9809 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2010-01-25 09:56:20 +00:00
parent 52cbe44918
commit b4d856a6b5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Core/Pei/FwVol/FwVol.c
View File

@ -853,6 +853,7 @@ ProcessFvFile (
EFI_PEI_FV_HANDLE ParentFvHandle; EFI_PEI_FV_HANDLE ParentFvHandle;
EFI_FIRMWARE_VOLUME_HEADER *FvHeader; EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
EFI_FV_FILE_INFO FileInfo; EFI_FV_FILE_INFO FileInfo;
UINT64 FvLength;
// //
// Check if this EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE file has already // Check if this EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE file has already
@ -890,7 +891,7 @@ ProcessFvFile (
// //
// FvAlignment must be more than 8 bytes required by FvHeader structure. // FvAlignment must be more than 8 bytes required by FvHeader structure.
// //
FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16); FvAlignment = 1 << ((ReadUnaligned32 (&FvHeader->Attributes) & EFI_FVB2_ALIGNMENT) >> 16);
if (FvAlignment < 8) { if (FvAlignment < 8) {
FvAlignment = 8; FvAlignment = 8;
} }
@ -899,11 +900,12 @@ ProcessFvFile (
// Check FvImage // Check FvImage
// //
if ((UINTN) FvHeader % FvAlignment != 0) { if ((UINTN) FvHeader % FvAlignment != 0) {
NewFvBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINT32) FvHeader->FvLength), FvAlignment); FvLength = ReadUnaligned64 (&FvHeader->FvLength);
NewFvBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINT32) FvLength), FvAlignment);
if (NewFvBuffer == NULL) { if (NewFvBuffer == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
CopyMem (NewFvBuffer, FvHeader, (UINTN) FvHeader->FvLength); CopyMem (NewFvBuffer, FvHeader, (UINTN) FvLength);
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) NewFvBuffer; FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) NewFvBuffer;
} }