OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move FW update uCode structure check to its own function 

Signed-off-by: Sean McGinn <sean.mcginn@intel.com>
This commit is contained in:
Sean McGinn 2022-05-10 17:07:09 -07:00 committed by Guo Dong
parent a52a054333
commit 7fca88c50d
2 changed files with 69 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
PayloadPkg/FirmwareUpdate/FirmwareUpdateHelper.c
View File

@ -1161,6 +1161,58 @@ Reboot (
CpuDeadLoop ();
}
/**
Verify uCode internal structure
@param[in] ImageHdr Pointer to the fw mgmt capsule image header
@retval EFI_SUCCESS The operation completed successfully.
@retval others There is error happening.
**/
EFI_STATUS
VerifyUcodeStruct (
IN EFI_FW_MGMT_CAP_IMAGE_HEADER *ImageHdr
)
{
UINTN ImageBase;
UINTN ImageOffset;
CPU_MICROCODE_HEADER *UCodeHdr;
UINT8 *ImageByte;
// Update is only supported for platforms that slot their uCode
if (PcdGet32 (PcdUcodeSlotSize) == 0) {
DEBUG((DEBUG_ERROR, "Existing image does not contain uCode slots!!\n"));
return EFI_UNSUPPORTED;
}
ImageBase = (UINTN)ImageHdr + sizeof(EFI_FW_MGMT_CAP_IMAGE_HEADER);
ImageOffset = 0;
// Ensure patches in update image start at slot boundaries
ImageByte = (UINT8*)(ImageBase + ImageOffset);
while (*ImageByte != PAD_BYTE && ImageOffset < ImageHdr->UpdateImageSize) {
UCodeHdr = (CPU_MICROCODE_HEADER *)ImageByte;
if (UCodeHdr->HeaderVersion != 1) {
DEBUG((DEBUG_ERROR, "Existing image slots do not line up with new image slots!!\n"));
return EFI_NO_MAPPING;
}
ImageOffset += PcdGet32(PcdUcodeSlotSize);
ImageByte = (UINT8*)(ImageBase + ImageOffset);
}
// Check remaining bytes are unused
while (ImageOffset < ImageHdr->UpdateImageSize) {
if (*ImageByte != PAD_BYTE) {
DEBUG((DEBUG_ERROR, "Existing image slots do not line up with new image slots!!\n"));
return EFI_NO_MAPPING;
}
++ImageOffset;
ImageByte = (UINT8*)(ImageBase + ImageOffset);
}
return EFI_SUCCESS;
}
/**
Verify the firmware internal structure.
@ -1174,42 +1226,12 @@ VerifyFwStruct (
IN EFI_FW_MGMT_CAP_IMAGE_HEADER *ImageHdr
)
{
UINTN ImageBase;
UINTN ImageOffset;
CPU_MICROCODE_HEADER *UCodeHdr;
UINT8 *ImageByte;
EFI_STATUS Status;
if ((UINT32)ImageHdr->UpdateHardwareInstance == FLASH_MAP_SIG_UCODE) {
// Update is only supported for platforms that slot their uCode
if (PcdGet32 (PcdUcodeSlotSize) == 0) {
DEBUG((DEBUG_ERROR, "Existing image does not contain uCode slots!!\n"));
return EFI_UNSUPPORTED;
}
ImageBase = (UINTN)ImageHdr + sizeof(EFI_FW_MGMT_CAP_IMAGE_HEADER);
ImageOffset = 0;
// Ensure patches in update image start at slot boundaries
ImageByte = (UINT8*)(ImageBase + ImageOffset);
while (*ImageByte != PAD_BYTE && ImageOffset < ImageHdr->UpdateImageSize) {
UCodeHdr = (CPU_MICROCODE_HEADER *)ImageByte;
if (UCodeHdr->HeaderVersion != 1) {
DEBUG((DEBUG_ERROR, "Existing image slots do not line up with new image slots!!\n"));
return EFI_NO_MAPPING;
}
ImageOffset += PcdGet32(PcdUcodeSlotSize);
ImageByte = (UINT8*)(ImageBase + ImageOffset);
}
// Check remaining bytes are unused
while (ImageOffset < ImageHdr->UpdateImageSize) {
if (*ImageByte != PAD_BYTE) {
DEBUG((DEBUG_ERROR, "Existing image slots do not line up with new image slots!!\n"));
return EFI_NO_MAPPING;
}
++ImageOffset;
ImageByte = (UINT8*)(ImageBase + ImageOffset);
Status = VerifyUcodeStruct (ImageHdr);
if (EFI_ERROR (Status)) {
return Status;
}
}

13
PayloadPkg/FirmwareUpdate/FirmwareUpdateHelper.h
View File

@ -98,6 +98,19 @@ VerifyFwVersion (
IN FIRMWARE_UPDATE_POLICY FwPolicy
);
/**
Verify uCode internal structure
@param[in] ImageHdr Pointer to the fw mgmt capsule image header
@retval EFI_SUCCESS The operation completed successfully.
@retval others There is error happening.
**/
EFI_STATUS
VerifyUcodeStruct (
IN EFI_FW_MGMT_CAP_IMAGE_HEADER *ImageHdr
);
/**
Verify the firmware internal structure.