Check return code and propagate error. Add a check for revision on PCD header.

Signed-off-by: Kelly J Couch <kelly.j.couch@intel.com>
(cherry picked from commit b386b528388c73a6ad0594f94c6977e4306a8ed5)

Author: kellycouch

DcpmPkg/common/PcdCommon.h

@@ -25,6 +25,7 @@ extern EFI_GUID gIntelDimmConfigVariableGuid;
 #define NVDIMM_CONFIGURATION_INPUT_SIG      SIGNATURE_32('C', 'I', 'N', '_')
 #define NVDIMM_CONFIGURATION_OUTPUT_SIG     SIGNATURE_32('C', 'O', 'U', 'T')
 #define NVDIMM_CONFIGURATION_HEADER_REVISION 1
+#define NVDIMM_CONFIGURATION_HEADER_LOWEST_COMPATIBLE_REVISION 1
 #define NVDIMM_CONFIGURATION_HEADER_OEM_ID "INTEL "
 #define NVDIMM_CONFIGURATION_HEADER_OEM_ID_LEN 6
 #define NVDIMM_CONFIGURATION_HEADER_OEM_TABLE_ID SIGNATURE_64('P', 'U', 'R', 'L', 'E', 'Y', ' ', ' ')

DcpmPkg/driver/Core/Dimm.c

@@ -2114,6 +2114,12 @@ EFI_STATUS ValidatePcdOemHeader(
     return EFI_VOLUME_CORRUPTED;
   }
 
+  if ((pOemHeader->Header.Revision > NVDIMM_CONFIGURATION_HEADER_REVISION) ||
+  (pOemHeader->Header.Revision < NVDIMM_CONFIGURATION_HEADER_LOWEST_COMPATIBLE_REVISION)){
+    NVDIMM_WARN("Unsupported revision of the DIMM Configuration Header table");
+    return EFI_VOLUME_CORRUPTED;
+  }
+
   if (pOemHeader->Header.Length > PCD_OEM_PARTITION_INTEL_CFG_REGION_SIZE) {
     NVDIMM_WARN("Length of PCD header is greater than PCD OEM partition size");
     return EFI_VOLUME_CORRUPTED;

DcpmPkg/driver/Protocol/Driver/NvmDimmConfig.c

@@ -3880,7 +3880,10 @@ GetMemoryResourcesInfo(
     pMemoryResourcesInfo->RawCapacity += pDimm->RawCapacity;
 
 #ifdef OS_BUILD
-	GetDimmMappedMemSize(pDimm);
+	ReturnCode = GetDimmMappedMemSize(pDimm);
+  if (EFI_ERROR(ReturnCode)) {
+    goto Finish;
+  }
 #endif // OS_BUILD
 
     ReturnCode = GetCapacities(pDimm->DimmID, &VolatileCapacity, &AppDirectCapacity,