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

Make sure CapsuleImage size is equal or less than DataBlock Size. And when copy the Capsule data from DataBlock to the continuous memory, CapsuleImage size should be used instead of DataBlock. 

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13304 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lzeng14 2012-05-11 01:37:23 +00:00
parent 4694dd1ba8
commit 240bc4ee8f
1 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
View File

@ -300,13 +300,14 @@ ValidateCapsuleIntegrity (
}
CapsuleCount ++;
CapsuleSize = CapsuleHeader->CapsuleImageSize;
} else {
if (CapsuleSize >= Ptr->Length) {
CapsuleSize = CapsuleSize - Ptr->Length;
} else {
CapsuleSize = 0;
}
}
if (CapsuleSize >= Ptr->Length) {
CapsuleSize = CapsuleSize - Ptr->Length;
} else {
CapsuleSize = 0;
}
//
// Move to next BLOCK descriptor
//
@ -314,9 +315,9 @@ ValidateCapsuleIntegrity (
}
}
if (CapsuleCount == 0) {
if ((CapsuleCount == 0) || (CapsuleSize != 0)) {
//
// No any capsule is found in BlockList.
// No any capsule is found in BlockList or capsule data is corrupted.
//
return NULL;
}
@ -1017,58 +1018,37 @@ CapsuleDataCoalesce (
//
IsCorrupted = FALSE;
CapsuleImageSize += SizeLeft;
CopyMem ((VOID *) DestPtr, (VOID *) (UINTN) CurrentBlockDesc->Union.DataBlock, (UINTN) CurrentBlockDesc->Length);
DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%8X from 0x%8lX to 0x%8lX with size 0x%8X\n",CapsuleTimes,
(UINTN)CurrentBlockDesc->Union.DataBlock, (UINTN)DestPtr, (UINTN)CurrentBlockDesc->Length));
//
// Cache the begin offset of this capsule
//
CapsuleOffset[CapsuleIndex++] = (UINT32) (UINTN) DestPtr - (UINT32)(UINTN)NewCapsuleBase - (UINT32)sizeof(EFI_CAPSULE_PEIM_PRIVATE_DATA);
}
}
if (CurrentBlockDesc->Length < SizeLeft) {
if (!IsCorrupted) {
CopyMem ((VOID *) DestPtr, (VOID *) (UINTN) (CurrentBlockDesc->Union.DataBlock), (UINTN)CurrentBlockDesc->Length);
DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%8X from 0x%8lX to 0x%8lX with size 0x%8X\n",CapsuleTimes,
(UINTN)CurrentBlockDesc->Union.DataBlock, (UINTN)DestPtr, (UINTN)CurrentBlockDesc->Length));
DestPtr += CurrentBlockDesc->Length;
}
//
// If the current block length is greater than or equal to SizeLeft, this is the
// start of the next capsule
//
if (CurrentBlockDesc->Length < SizeLeft) {
SizeLeft -= CurrentBlockDesc->Length;
} else {
//
// Start the next cycle
//
SizeLeft = 0;
IsCorrupted = TRUE;
CapsuleBeginFlag = TRUE;
}
SizeLeft -= CurrentBlockDesc->Length;
} else {
//
//Go on relocating the current capule image.
//Here is the end of the current capsule image.
//
if (CurrentBlockDesc->Length < SizeLeft) {
if (!IsCorrupted) {
CopyMem ((VOID *) DestPtr, (VOID *) (UINTN) (CurrentBlockDesc->Union.DataBlock), (UINTN)CurrentBlockDesc->Length);
DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%8X from 0x%8lX to 0x%8lX with size 0x%8X\n",CapsuleTimes,
(UINTN)CurrentBlockDesc->Union.DataBlock, (UINTN)DestPtr, (UINTN)CurrentBlockDesc->Length));
DestPtr += CurrentBlockDesc->Length;
}
SizeLeft -= CurrentBlockDesc->Length;
} else {
//
//Here is the end of the current capsule image.
//
if (!IsCorrupted) {
CopyMem ((VOID *) DestPtr, (VOID *)(UINTN)(CurrentBlockDesc->Union.DataBlock), (UINTN)CurrentBlockDesc->Length);
DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%8X from 0x%8lX to 0x%8lX with size 0x%8X\n",CapsuleTimes,
(UINTN)CurrentBlockDesc->Union.DataBlock, (UINTN)DestPtr, (UINTN)CurrentBlockDesc->Length));
DestPtr += CurrentBlockDesc->Length;
}
//
// Start the next cycle
//
SizeLeft = 0;
IsCorrupted = TRUE;
CapsuleBeginFlag = TRUE;
if (!IsCorrupted) {
CopyMem ((VOID *) DestPtr, (VOID *)(UINTN)(CurrentBlockDesc->Union.DataBlock), (UINTN) SizeLeft);
DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%8X from 0x%8lX to 0x%8lX with size 0x%8X\n",CapsuleTimes,
(UINTN)CurrentBlockDesc->Union.DataBlock, (UINTN)DestPtr, (UINTN) SizeLeft));
DestPtr += SizeLeft;
}
//
// Start the next cycle
//
SizeLeft = 0;
IsCorrupted = TRUE;
CapsuleBeginFlag = TRUE;
}
} else {
//