SecurityPkg OpalPasswordSmm: Always execute BlockSid command.

[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPasswordSmm / OpalPasswordSmm.c

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c b/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
index 46311bd8a0d98f98d686625813c29a3e7e829a2a..47b570f343424feb118126bfeba49db26865d53c 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
@@ -442,19 +442,19 @@ SmmUnlockOpalPassword (
       Session.MediaId = 0;\r
       Session.OpalBaseComId = OpalDev->OpalBaseComId;\r
 \r
-      if (mSendBlockSID && BlockSidSupport) {\r
-        Result = OpalBlockSid (&Session, TRUE);\r
-        if (Result != TcgResultSuccess) {\r
-          break;\r
-        }\r
-      }\r
-\r
       Result = OpalSupportUnlock (&Session, OpalDev->Password, OpalDev->PasswordLength, NULL);\r
       if (Result == TcgResultSuccess) {\r
         Status = EFI_SUCCESS;\r
       }\r
     }\r
 \r
+    if (mSendBlockSID && BlockSidSupport) {\r
+      Result = OpalBlockSid (&Session, TRUE);\r
+      if (Result != TcgResultSuccess) {\r
+        break;\r
+      }\r
+    }\r
+\r
     if (OpalDev->DeviceType == OPAL_DEVICE_TYPE_NVME) {\r
       if (SubClassCode == PCI_CLASS_MASS_STORAGE_NVM) {\r
         Status = NvmeControllerExit (&mNvmeContext);\r