SecurityPkg/SecureBootConfigDxe: Use StrToGuid in BaseLib

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 6f587291e2..16ca9578ba 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -3248,6 +3248,7 @@ SecureBootCallback (
 {

   EFI_INPUT_KEY                   Key;

   EFI_STATUS                      Status;

+  RETURN_STATUS                   RStatus;

   SECUREBOOT_CONFIG_PRIVATE_DATA  *Private;

   UINTN                           BufferSize;

   SECUREBOOT_CONFIGURATION        *IfrNvData;

@@ -3630,12 +3631,9 @@ SecureBootCallback (
     case KEY_SECURE_BOOT_SIGNATURE_GUID_DBX:

     case KEY_SECURE_BOOT_SIGNATURE_GUID_DBT:

       ASSERT (Private->SignatureGUID != NULL);

-      Status = StringToGuid (

-                 IfrNvData->SignatureGuid,

-                 StrLen (IfrNvData->SignatureGuid),

-                 Private->SignatureGUID

-                 );

-      if (EFI_ERROR (Status)) {

+      RStatus = StrToGuid (IfrNvData->SignatureGuid, Private->SignatureGUID);

+      if (RETURN_ERROR (RStatus) || (IfrNvData->SignatureGuid[GUID_STRING_LENGTH] != L'\0')) {

+        Status = EFI_INVALID_PARAMETER;

         break;

       }