ocvalidate: Add AsciiGuidIsLegal API

acidburn0zzz · Dec 27, 2020 · 3869e19 · 3869e19
1 parent 380ea0c
commit 3869e19
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/Utilities/ocvalidate/OcValidateLib.c b/Utilities/ocvalidate/OcValidateLib.c
@@ -301,6 +301,19 @@ AsciiDevicePathIsLegal (
   return RetVal;
 }
 
+BOOLEAN
+AsciiGuidIsLegal (
+  IN  CONST CHAR8  *AsciiGuid
+  )
+{
+  EFI_STATUS  Status;
+  GUID        Guid;
+
+  Status = AsciiStrToGuid (AsciiGuid, &Guid);
+
+  return !EFI_ERROR (Status);
+}
+
 BOOLEAN
 DataHasProperMasking (
   IN  CONST VOID   *Data,

diff --git a/Utilities/ocvalidate/OcValidateLib.h b/Utilities/ocvalidate/OcValidateLib.h
@@ -119,6 +119,18 @@ AsciiDevicePathIsLegal (
   IN  CONST CHAR8  *AsciiDevicePath
   );
 
+/**
+  Check if a GUID in ASCII is valid.
+
+  @param[in]  AsciiGuid                GUID to be checked.
+
+  @retval     TRUE                     If AsciiGuid has valid GUID format.
+**/
+BOOLEAN
+AsciiGuidIsLegal (
+  IN  CONST CHAR8  *AsciiGuid
+  );
+
 /**
   Check if a set of data has proper masking set.
 

diff --git a/Utilities/ocvalidate/ValidateNVRAM.c b/Utilities/ocvalidate/ValidateNVRAM.c
@@ -22,13 +22,11 @@ CheckNVRAM (
   )
 {
   UINT32           ErrorCount;
-  EFI_STATUS       Status;
   UINT32           GuidIndex;
   UINT32           VariableIndex;
   OC_NVRAM_CONFIG  *UserNVRAM;
   CONST CHAR8      *AsciiGuid;
   CONST CHAR8      *AsciiNVRAMKey;
-  GUID             VariableGuid;
   OC_ASSOC         *VariableMap;
 
   DEBUG ((DEBUG_VERBOSE, "config loaded into NVRAM checker!\n"));
@@ -38,9 +36,8 @@ CheckNVRAM (
 
   for (GuidIndex = 0; GuidIndex < UserNVRAM->Add.Count; ++GuidIndex) {
     AsciiGuid = OC_BLOB_GET (UserNVRAM->Add.Keys[GuidIndex]);
-    Status    = AsciiStrToGuid (AsciiGuid, &VariableGuid);
 
-    if (EFI_ERROR (Status)) {
+    if (!AsciiGuidIsLegal (AsciiGuid)) {
       DEBUG ((DEBUG_WARN, "NVRAM->Add[%u] has borked GUID!\n", GuidIndex));
       ++ErrorCount;
     }
@@ -67,9 +64,8 @@ CheckNVRAM (
 
   for (GuidIndex = 0; GuidIndex < UserNVRAM->Delete.Count; ++GuidIndex) {
     AsciiGuid = OC_BLOB_GET (UserNVRAM->Delete.Keys[GuidIndex]);
-    Status    = AsciiStrToGuid (AsciiGuid, &VariableGuid);
 
-    if (EFI_ERROR (Status)) {
+    if (!AsciiGuidIsLegal (AsciiGuid)) {
       DEBUG ((DEBUG_WARN, "NVRAM->Delete[%u] has borked GUID!\n", GuidIndex));
       ++ErrorCount;
     }
@@ -94,9 +90,8 @@ CheckNVRAM (
 
   for (GuidIndex = 0; GuidIndex < UserNVRAM->Legacy.Count; ++GuidIndex) {
     AsciiGuid = OC_BLOB_GET (UserNVRAM->Legacy.Keys[GuidIndex]);
-    Status    = AsciiStrToGuid (AsciiGuid, &VariableGuid);
 
-    if (EFI_ERROR (Status)) {
+    if (!AsciiGuidIsLegal (AsciiGuid)) {
       DEBUG ((DEBUG_WARN, "NVRAM->LegacySchema[%u] has borked GUID!\n", GuidIndex));
       ++ErrorCount;
     }

diff --git a/Utilities/ocvalidate/ValidatePlatformInfo.c b/Utilities/ocvalidate/ValidatePlatformInfo.c
@@ -27,14 +27,12 @@ CheckPlatformInfo (
   )
 {
   UINT32              ErrorCount;
-  EFI_STATUS          Status;
   OC_PLATFORM_CONFIG  *UserPlatformInfo;
   BOOLEAN             IsAutomaticEnabled;
   CONST CHAR8         *UpdateSMBIOSMode;
   CONST CHAR8         *SystemProductName;
   CONST CHAR8         *SystemMemoryStatus;
   CONST CHAR8         *AsciiSystemUUID;
-  GUID                Guid;
 
   DEBUG ((DEBUG_VERBOSE, "config loaded into PlatformInfo checker!\n"));
 
@@ -73,8 +71,7 @@ CheckPlatformInfo (
     ++ErrorCount;
   }
 
-  Status = AsciiStrToGuid (AsciiSystemUUID, &Guid);
-  if (EFI_ERROR (Status)) {
+  if (AsciiSystemUUID[0] != '\0' && !AsciiGuidIsLegal (AsciiSystemUUID)) {
     DEBUG ((DEBUG_WARN, "PlatformInfo->Generic->SystemUUID is borked!\n"));
     ++ErrorCount;
   }