Main SEC phase code. Transitions to PEI.\r
\r
Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
\r
- This program and the accompanying materials\r
- are licensed and made available under the terms and conditions of the BSD License\r
- which accompanies this distribution. The full text of the license may be found at\r
- http://opensource.org/licenses/bsd-license.php\r
-\r
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+ SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
}\r
\r
File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
- Size = *(UINT32*) File->Size & 0xffffff;\r
+ Size = FFS_FILE_SIZE (File);\r
if (Size < (sizeof (*File) + sizeof (EFI_COMMON_SECTION_HEADER))) {\r
return EFI_VOLUME_CORRUPTED;\r
}\r
UINT32 AuthenticationStatus;\r
VOID *OutputBuffer;\r
VOID *ScratchBuffer;\r
- EFI_FIRMWARE_VOLUME_IMAGE_SECTION *FvSection;\r
+ EFI_COMMON_SECTION_HEADER *FvSection;\r
EFI_FIRMWARE_VOLUME_HEADER *PeiMemFv;\r
EFI_FIRMWARE_VOLUME_HEADER *DxeMemFv;\r
+ UINT32 FvHeaderSize;\r
+ UINT32 FvSectionSize;\r
\r
- FvSection = (EFI_FIRMWARE_VOLUME_IMAGE_SECTION*) NULL;\r
+ FvSection = (EFI_COMMON_SECTION_HEADER*) NULL;\r
\r
Status = FindFfsFileAndSection (\r
*Fv,\r
\r
OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB);\r
ScratchBuffer = ALIGN_POINTER ((UINT8*) OutputBuffer + OutputBufferSize, SIZE_1MB);\r
+\r
+ DEBUG ((EFI_D_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x "\r
+ "PcdOvmfDecompressionScratchEnd=0x%x\n", __FUNCTION__, OutputBuffer,\r
+ OutputBufferSize, ScratchBuffer, ScratchBufferSize,\r
+ PcdGet32 (PcdOvmfDecompressionScratchEnd)));\r
+ ASSERT ((UINTN)ScratchBuffer + ScratchBufferSize ==\r
+ PcdGet32 (PcdOvmfDecompressionScratchEnd));\r
+\r
Status = ExtractGuidedSectionDecode (\r
Section,\r
&OutputBuffer,\r
OutputBufferSize,\r
EFI_SECTION_FIRMWARE_VOLUME_IMAGE,\r
0,\r
- (EFI_COMMON_SECTION_HEADER**) &FvSection\r
+ &FvSection\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "Unable to find PEI FV section\n"));\r
OutputBufferSize,\r
EFI_SECTION_FIRMWARE_VOLUME_IMAGE,\r
1,\r
- (EFI_COMMON_SECTION_HEADER**) &FvSection\r
+ &FvSection\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "Unable to find DXE FV section\n"));\r
}\r
\r
ASSERT (FvSection->Type == EFI_SECTION_FIRMWARE_VOLUME_IMAGE);\r
- ASSERT (SECTION_SIZE (FvSection) ==\r
- (PcdGet32 (PcdOvmfDxeMemFvSize) + sizeof (*FvSection)));\r
+\r
+ if (IS_SECTION2 (FvSection)) {\r
+ FvSectionSize = SECTION2_SIZE (FvSection);\r
+ FvHeaderSize = sizeof (EFI_COMMON_SECTION_HEADER2);\r
+ } else {\r
+ FvSectionSize = SECTION_SIZE (FvSection);\r
+ FvHeaderSize = sizeof (EFI_COMMON_SECTION_HEADER);\r
+ }\r
+\r
+ ASSERT (FvSectionSize == (PcdGet32 (PcdOvmfDxeMemFvSize) + FvHeaderSize));\r
\r
DxeMemFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase);\r
- CopyMem (DxeMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfDxeMemFvSize));\r
+ CopyMem (DxeMemFv, (VOID*) ((UINTN)FvSection + FvHeaderSize), PcdGet32 (PcdOvmfDxeMemFvSize));\r
\r
if (DxeMemFv->Signature != EFI_FVH_SIGNATURE) {\r
DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv));\r
OUT EFI_PHYSICAL_ADDRESS *PeiCoreImageBase\r
)\r
{\r
+ BOOLEAN S3Resume;\r
+\r
*PeiCoreImageBase = 0;\r
\r
- if (IsS3Resume ()) {\r
+ S3Resume = IsS3Resume ();\r
+ if (S3Resume && !FeaturePcdGet (PcdSmmSmramRequire)) {\r
+ //\r
+ // A malicious runtime OS may have injected something into our previously\r
+ // decoded PEI FV, but we don't care about that unless SMM/SMRAM is required.\r
+ //\r
DEBUG ((EFI_D_VERBOSE, "SEC: S3 resume\n"));\r
GetS3ResumePeiFv (BootFv);\r
} else {\r
- DEBUG ((EFI_D_VERBOSE, "SEC: Normal boot\n"));\r
+ //\r
+ // We're either not resuming, or resuming "securely" -- we'll decompress\r
+ // both PEI FV and DXE FV from pristine flash.\r
+ //\r
+ DEBUG ((EFI_D_VERBOSE, "SEC: %a\n",\r
+ S3Resume ? "S3 resume (with PEI decompression)" : "Normal boot"));\r
FindMainFv (BootFv);\r
\r
DecompressMemFvs (BootFv);\r
}\r
\r
File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
- Size = *(UINT32*) File->Size & 0xffffff;\r
+ Size = FFS_FILE_SIZE (File);\r
if (Size < sizeof (*File)) {\r
return EFI_NOT_FOUND;\r
}\r
CurrentAddress = (EndOfSection + 3) & 0xfffffffffffffffcULL;\r
Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r
\r
- Size = *(UINT32*) Section->Size & 0xffffff;\r
+ Size = SECTION_SIZE (Section);\r
if (Size < sizeof (*Section)) {\r
return EFI_NOT_FOUND;\r
}\r
/*\r
Find and return Pei Core entry point.\r
\r
- It also find SEC and PEI Core file debug inforamtion. It will report them if\r
+ It also find SEC and PEI Core file debug information. It will report them if\r
remote debug is enabled.\r
\r
**/\r
if (SetJump (&JumpBuffer) == 0) {\r
#if defined (MDE_CPU_IA32)\r
JumpBuffer.Esp = JumpBuffer.Esp + DebugAgentContext.StackMigrateOffset;\r
+ JumpBuffer.Ebp = JumpBuffer.Ebp + DebugAgentContext.StackMigrateOffset;\r
#endif \r
#if defined (MDE_CPU_X64)\r
JumpBuffer.Rsp = JumpBuffer.Rsp + DebugAgentContext.StackMigrateOffset;\r
+ JumpBuffer.Rbp = JumpBuffer.Rbp + DebugAgentContext.StackMigrateOffset;\r
#endif \r
LongJump (&JumpBuffer, (UINTN)-1);\r
}\r
projects / mirror_edk2.git / blobdiff