From: Yao, Jiewen <jiewen.yao@intel.com>
Date: Wed, 2 Sep 2015 06:29:06 +0000 (+0000)
Subject: Add more strict check for MOR variable, besides MOR lock variable.
X-Git-Tag: edk2-stable201903~8923
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=776566530b15a4241db00ac317659e5904ad453c;hp=465be78e4d7c2ac2c21e5a673afa323d097a4a7b

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 7ca707915e..c6f3edc756 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
@@ -143,20 +143,21 @@ SetVariableCheckHandlerMor (
     return EFI_INVALID_PARAMETER;
   }
   
+  //
+  // Delete not OK
+  //
+  if ((DataSize != sizeof(UINT8)) || (Data == NULL) || (Attributes == 0)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   //
   // check format
   //
   if (IsMorLockVariable(VariableName, VendorGuid)) {
-    //
-    // Delete not OK
-    //
-    if ((DataSize == 0) || (Data == NULL) || (Attributes == 0)) {
-      return EFI_INVALID_PARAMETER;
-    }
     //
     // set to any other value not OK
     //
-    if ((DataSize != sizeof(UINT8)) || ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0))) {
+    if ((*(UINT8 *)Data != 1) && (*(UINT8 *)Data != 0)) {
       return EFI_INVALID_PARAMETER;
     }
   }