Add more strict check for MOR variable, besides MOR lock variable.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Zhang, Chao B" <chao.b.zhang@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18383 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
index 7ca707915e25425ee859482bb8dc28e874c0ce88..c6f3edc75631c91379fbabda6a816363e449d740 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
@@ -143,20 +143,21 @@ SetVariableCheckHandlerMor (
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
+  //\r
+  // Delete not OK\r
+  //\r
+  if ((DataSize != sizeof(UINT8)) || (Data == NULL) || (Attributes == 0)) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   //\r
   // check format\r
   //\r
   if (IsMorLockVariable(VariableName, VendorGuid)) {\r
-    //\r
-    // Delete not OK\r
-    //\r
-    if ((DataSize == 0) || (Data == NULL) || (Attributes == 0)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
     //\r
     // set to any other value not OK\r
     //\r
-    if ((DataSize != sizeof(UINT8)) || ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0))) {\r
+    if ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r