Refine code to make it more safely.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVol / Ffs.c

diff --git a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
index 1c11dde036b0607e0926837c59ba1a4b941b54aa..20dade18a275c7a4c830cd53d36ced5cda5d05de 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
@@ -1,8 +1,8 @@
 /** @file\r
   FFS file access utilities.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\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
@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 #include "DxeMain.h"\r
+#include "FwVolDriver.h"\r
 \r
 \r
 /**\r
@@ -104,18 +105,9 @@ VerifyFvHeaderChecksum (
   IN EFI_FIRMWARE_VOLUME_HEADER *FvHeader\r
   )\r
 {\r
-  UINT32  Index;\r
-  UINT32  HeaderLength;\r
   UINT16  Checksum;\r
-  UINT16  *Ptr;\r
 \r
-  HeaderLength = FvHeader->HeaderLength;\r
-  Ptr = (UINT16 *)FvHeader;\r
-  Checksum = 0;\r
-\r
-  for (Index = 0; Index < HeaderLength / sizeof (UINT16); Index++) {\r
-    Checksum = (UINT16)(Checksum + Ptr[Index]);\r
-  }\r
+  Checksum = CalculateSum16 ((UINT16 *) FvHeader, FvHeader->HeaderLength);\r
 \r
   if (Checksum == 0) {\r
     return TRUE;\r
@@ -139,16 +131,13 @@ VerifyHeaderChecksum (
   IN EFI_FFS_FILE_HEADER  *FfsHeader\r
   )\r
 {\r
-  UINT32            Index;\r
-  UINT8             *Ptr;\r
-  UINT8             HeaderChecksum;\r
-\r
-  Ptr = (UINT8 *)FfsHeader;\r
-  HeaderChecksum = 0;\r
-  for (Index = 0; Index < sizeof(EFI_FFS_FILE_HEADER); Index++) {\r
-    HeaderChecksum = (UINT8)(HeaderChecksum + Ptr[Index]);\r
-  }\r
+  UINT8 HeaderChecksum;\r
 \r
+  if (IS_FFS_FILE2 (FfsHeader)) {\r
+    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER2));\r
+  } else {\r
+    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+  }\r
   HeaderChecksum = (UINT8) (HeaderChecksum - FfsHeader->State - FfsHeader->IntegrityCheck.Checksum.File);\r
 \r
   if (HeaderChecksum == 0) {\r
@@ -216,6 +205,7 @@ IsValidFfsFile (
   )\r
 {\r
   EFI_FFS_FILE_STATE  FileState;\r
+  UINT8               DataCheckSum;\r
 \r
   FileState = GetFileState (ErasePolarity, FfsHeader);\r
   switch (FileState) {\r
@@ -223,11 +213,17 @@ IsValidFfsFile (
   case EFI_FILE_DELETED:\r
   case EFI_FILE_DATA_VALID:\r
   case EFI_FILE_MARKED_FOR_UPDATE:\r
-    //\r
-    // Some other vliadation like file content checksum might be done here.\r
-    // For performance issue, Tiano only do FileState check.\r
-    //\r
-    return TRUE;\r
+    DataCheckSum = FFS_FIXED_CHECKSUM;\r
+    if ((FfsHeader->Attributes & FFS_ATTRIB_CHECKSUM) == FFS_ATTRIB_CHECKSUM) {\r
+      if (IS_FFS_FILE2 (FfsHeader)) {\r
+        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER2), FFS_FILE2_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER2));\r
+      } else {\r
+        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER), FFS_FILE_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER));\r
+      }\r
+    }\r
+    if (FfsHeader->IntegrityCheck.Checksum.File == DataCheckSum) {\r
+      return TRUE;\r
+    }\r
 \r
   default:\r
     return FALSE;\r