SecurityPkg: Use IsZeroGuid API for zero GUID checking

[mirror_edk2.git] / SecurityPkg / Library / TcgStorageOpalLib / TcgStorageOpalUtil.c

diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index 2d3ecb474cfac4f7e5cfe73915c88d2b64f3f614..f77fbe25c1043fda255cbd9abe2cbb18fbd7b60b 100644 (file)
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
-#include <uefi.h>\r
+#include <Uefi.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/TcgStorageOpalLib.h>\r
@@ -626,7 +626,7 @@ OpalUtilRevert(
   // Try to revert with admin1\r
   //\r
   Ret = OpalAdminRevert(Session, KeepUserData, &MethodStatus);\r
-  if (Ret != TcgResultSuccess || MethodStatus == TCG_METHOD_STATUS_CODE_SUCCESS) {\r
+  if (Ret != TcgResultSuccess || MethodStatus != TCG_METHOD_STATUS_CODE_SUCCESS) {\r
     //\r
     // Device ends the session on successful revert, so only call OpalEndSession when fail.\r
     //\r
@@ -853,8 +853,9 @@ OpalUtilDetermineOwnership(
   TCG_RESULT       Ret;\r
   OPAL_OWNER_SHIP  Owner;\r
 \r
-  NULL_CHECK(Session);\r
-  NULL_CHECK(Msid);\r
+  if ((Session == NULL) || (Msid == NULL)) {\r
+    return OpalOwnershipUnknown;\r
+  }\r
 \r
   Owner = OpalOwnershipUnknown;\r
   //\r