MdeModulePkg/CdExpressPei: Fix capsule size mismatch issue.

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / CdExpressPei / PeiCdExpress.c

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index 2f8d1abed09823f2fc932f971fb2c573d99e40b0..371ab733bc2b2cbeee87e4ff63bc55ec3cc3195a 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,7 +1,7 @@
 /** @file\r
   Source file for CD recovery PEIM\r
 \r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -162,6 +162,8 @@ UpdateBlocksAndVolumes (
   EFI_PEI_SERVICES                **PeiServices;\r
 \r
   IndexBlockDevice = 0;\r
+  BlockIo2Ppi      = NULL;\r
+  BlockIoPpi       = NULL;\r
   //\r
   // Find out all Block Io Ppi instances within the system\r
   // Assuming all device Block Io Peims are dispatched already\r
@@ -475,13 +477,14 @@ RetrieveCapsuleFileFromRoot (
     }\r
 \r
     PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleStartLBA = FileRecord->LocationOfExtent[0];\r
-    PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleSize =\r
+    PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleBlockAlignedSize =\r
       (\r
         FileRecord->DataLength[0] /\r
         PEI_CD_BLOCK_SIZE +\r
         1\r
       ) *\r
       PEI_CD_BLOCK_SIZE;\r
+    PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleSize = FileRecord->DataLength[0];\r
 \r
     return EFI_SUCCESS;\r
   }\r
@@ -657,7 +660,7 @@ LoadRecoveryCapsule (
                           BlockIo2Ppi,\r
                           PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
                           PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleSize,\r
+                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
                           Buffer\r
                           );\r
   } else {\r
@@ -666,7 +669,7 @@ LoadRecoveryCapsule (
                           BlockIoPpi,\r
                           PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
                           PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleSize,\r
+                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
                           Buffer\r
                           );\r
   }\r