MdeModulePkg SmbiosMeasurementDxe: Skip measurement for OEM type

[mirror_edk2.git] / MdeModulePkg / Universal / SmbiosMeasurementDxe / SmbiosMeasurementDxe.c

diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
index bc5e7464e1339638a2305fcc19fccb3b953d7d97..4a3e99aefd0f7d45472a133e4d457bbe66720cd2 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
+++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
@@ -1,7 +1,7 @@
 /** @file\r
   This driver measures SMBIOS table to TPM.\r
 \r
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2017, 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
@@ -277,30 +277,38 @@ FilterSmbiosEntry (
   DEBUG ((EFI_D_INFO, "Smbios Table (Type - %d):\n", ((SMBIOS_STRUCTURE *)TableEntry)->Type));\r
   DEBUG_CODE (InternalDumpHex (TableEntry, TableEntrySize););\r
 \r
-  FilterStruct = GetFilterStructByType (((SMBIOS_STRUCTURE *)TableEntry)->Type);\r
-  if (FilterStruct != NULL) {\r
-    if (FilterStruct->Filter == NULL || FilterStruct->FilterCount == 0) {\r
-      // zero all table entries, except header\r
-      ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySize - sizeof(SMBIOS_STRUCTURE));\r
-    } else {\r
-      Filter = FilterStruct->Filter;\r
-      for (Index = 0; Index < FilterStruct->FilterCount; Index++) {\r
-        if (((SMBIOS_STRUCTURE *) TableEntry)->Length >= (Filter[Index].Offset + Filter[Index].Size)) {\r
-          //\r
-          // The field is present in the SMBIOS entry.\r
-          //\r
-          if ((Filter[Index].Flags & SMBIOS_FILTER_TABLE_FLAG_IS_STRING) != 0) {\r
-            CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offset, sizeof(StringId));\r
-            if (StringId != 0) {\r
-              // set ' ' for string field\r
-              String = GetSmbiosStringById (TableEntry, StringId, &StringLen);\r
-              ASSERT (String != NULL);\r
-              //DEBUG ((EFI_D_INFO,"StrId(0x%x)-%a(%d)\n", StringId, String, StringLen));\r
-              SetMem (String, StringLen, ' ');\r
+  //\r
+  // Skip measurement for OEM types.\r
+  //\r
+  if (((SMBIOS_STRUCTURE *)TableEntry)->Type >= SMBIOS_OEM_BEGIN) {\r
+    // zero all table fields, except header\r
+    ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySize - sizeof(SMBIOS_STRUCTURE));\r
+  } else {\r
+    FilterStruct = GetFilterStructByType (((SMBIOS_STRUCTURE *)TableEntry)->Type);\r
+    if (FilterStruct != NULL) {\r
+      if (FilterStruct->Filter == NULL || FilterStruct->FilterCount == 0) {\r
+        // zero all table fields, except header\r
+        ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySize - sizeof(SMBIOS_STRUCTURE));\r
+      } else {\r
+        Filter = FilterStruct->Filter;\r
+        for (Index = 0; Index < FilterStruct->FilterCount; Index++) {\r
+          if (((SMBIOS_STRUCTURE *) TableEntry)->Length >= (Filter[Index].Offset + Filter[Index].Size)) {\r
+            //\r
+            // The field is present in the SMBIOS entry.\r
+            //\r
+            if ((Filter[Index].Flags & SMBIOS_FILTER_TABLE_FLAG_IS_STRING) != 0) {\r
+              CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offset, sizeof(StringId));\r
+              if (StringId != 0) {\r
+                // set ' ' for string field\r
+                String = GetSmbiosStringById (TableEntry, StringId, &StringLen);\r
+                ASSERT (String != NULL);\r
+                //DEBUG ((EFI_D_INFO,"StrId(0x%x)-%a(%d)\n", StringId, String, StringLen));\r
+                SetMem (String, StringLen, ' ');\r
+              }\r
             }\r
+            // zero non-string field\r
+            ZeroMem ((UINT8 *)TableEntry + Filter[Index].Offset, Filter[Index].Size);\r
           }\r
-          // zero non-string field\r
-          ZeroMem ((UINT8 *)TableEntry + Filter[Index].Offset, Filter[Index].Size);\r
         }\r
       }\r
     }\r