MdeModulePkg/IntelFrameworkModulePkg FwVol:
Move the check of FV Header signature and file system to GetFwVolHeader() to avoid reading the whole unexpected FvHeader. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16255 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -2595,6 +2595,8 @@ ReadFvbData (
|
||||
@retval EFI_OUT_OF_RESOURCES No enough buffer could be allocated.
|
||||
@retval EFI_SUCCESS Successfully read volume header to the allocated
|
||||
buffer.
|
||||
@retval EFI_INVALID_PARAMETER The FV Header signature is not as expected or
|
||||
the file system could not be understood.
|
||||
|
||||
**/
|
||||
EFI_STATUS
|
||||
|
@@ -173,6 +173,8 @@ ReadFvbData (
|
||||
@retval EFI_OUT_OF_RESOURCES No enough buffer could be allocated.
|
||||
@retval EFI_SUCCESS Successfully read volume header to the allocated
|
||||
buffer.
|
||||
@retval EFI_INVALID_PARAMETER The FV Header signature is not as expected or
|
||||
the file system could not be understood.
|
||||
|
||||
**/
|
||||
EFI_STATUS
|
||||
@@ -199,6 +201,22 @@ GetFwVolHeader (
|
||||
return Status;
|
||||
}
|
||||
|
||||
//
|
||||
// Validate FV Header signature, if not as expected, continue.
|
||||
//
|
||||
if (TempFvh.Signature != EFI_FVH_SIGNATURE) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
//
|
||||
// Check to see that the file system is indeed formatted in a way we can
|
||||
// understand it...
|
||||
//
|
||||
if ((!CompareGuid (&TempFvh.FileSystemGuid, &gEfiFirmwareFileSystem2Guid)) &&
|
||||
(!CompareGuid (&TempFvh.FileSystemGuid, &gEfiFirmwareFileSystem3Guid))) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
//
|
||||
// Allocate a buffer for the caller
|
||||
//
|
||||
@@ -658,29 +676,11 @@ NotifyFwVolBlock (
|
||||
}
|
||||
ASSERT (FwVolHeader != NULL);
|
||||
|
||||
//
|
||||
// Validate FV Header signature, if not as expected, continue.
|
||||
//
|
||||
if (FwVolHeader->Signature != EFI_FVH_SIGNATURE) {
|
||||
CoreFreePool (FwVolHeader);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!VerifyFvHeaderChecksum (FwVolHeader)) {
|
||||
CoreFreePool (FwVolHeader);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Check to see that the file system is indeed formatted in a way we can
|
||||
// understand it...
|
||||
//
|
||||
if ((!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem2Guid)) &&
|
||||
(!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem3Guid))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
//
|
||||
// Check if there is an FV protocol already installed in that handle
|
||||
//
|
||||
|
@@ -405,25 +405,4 @@ IsValidFfsFile (
|
||||
IN EFI_FFS_FILE_HEADER *FfsHeader
|
||||
);
|
||||
|
||||
|
||||
/**
|
||||
given the supplied FW_VOL_BLOCK_PROTOCOL, allocate a buffer for output and
|
||||
copy the volume header into it.
|
||||
|
||||
@param Fvb The FW_VOL_BLOCK_PROTOCOL instance from which to
|
||||
read the volume header
|
||||
@param FwVolHeader Pointer to pointer to allocated buffer in which
|
||||
the volume header is returned.
|
||||
|
||||
@retval EFI_OUT_OF_RESOURCES No enough buffer could be allocated.
|
||||
@retval EFI_SUCCESS Successfully read volume header to the allocated
|
||||
buffer.
|
||||
|
||||
**/
|
||||
EFI_STATUS
|
||||
GetFwVolHeader (
|
||||
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb,
|
||||
OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader
|
||||
);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user