X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FFwVolBlock%2FFwVolBlock.c;h=27e9f9e0b1147a87c0c5f7bdb1ae0706e5667822;hp=02b8914ff82ea767295775d21a1caea43013332c;hb=d613c2a88b3db6b7b451d0b90b08343666792d04;hpb=84266565f5957184483515157987168e2c930a60

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index 02b8914ff8..27e9f9e0b1 100644
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
@@ -1,11 +1,11 @@
 /** @file
   Implementations for Firmware Volume Block protocol.
 
-  It consumes FV HOBs and creates read-lonly Firmare Volume Block protocol
+  It consumes FV HOBs and creates read-only Firmare Volume Block protocol
   instances for each of them.
 
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
@@ -450,6 +450,9 @@ ProduceFVBProtocolOnBuffer (
   // Get FvHeader alignment
   //
   FvAlignment = 1 << ((FwVolHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
+  //
+  // FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value. 
+  //
   if (FvAlignment < 8) {
     FvAlignment = 8;
   }
@@ -513,6 +516,10 @@ ProduceFVBProtocolOnBuffer (
     // FV does not contains extension header, then produce MEMMAP_DEVICE_PATH
     //
     FvbDev->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocateCopyPool (sizeof (FV_MEMMAP_DEVICE_PATH), &mFvMemmapDevicePathTemplate);
+    if (FvbDev->DevicePath == NULL) {
+      FreePool (FvbDev);
+      return EFI_OUT_OF_RESOURCES;
+    }
     ((FV_MEMMAP_DEVICE_PATH *) FvbDev->DevicePath)->MemMapDevPath.StartingAddress = BaseAddress;
     ((FV_MEMMAP_DEVICE_PATH *) FvbDev->DevicePath)->MemMapDevPath.EndingAddress   = BaseAddress + FwVolHeader->FvLength - 1;
   } else {
@@ -520,6 +527,10 @@ ProduceFVBProtocolOnBuffer (
     // FV contains extension header, then produce MEDIA_FW_VOL_DEVICE_PATH
     //
     FvbDev->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocateCopyPool (sizeof (FV_PIWG_DEVICE_PATH), &mFvPIWGDevicePathTemplate);
+    if (FvbDev->DevicePath == NULL) {
+      FreePool (FvbDev);
+      return EFI_OUT_OF_RESOURCES;
+    }
     CopyGuid (
       &((FV_PIWG_DEVICE_PATH *)FvbDev->DevicePath)->FvDevPath.FvName, 
       (GUID *)(UINTN)(BaseAddress + FwVolHeader->ExtHeaderOffset)