X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FVariableAuthenticated%2FRuntimeDxe%2FVariable.c;h=0846b2a21b83778d2499354a5c826ef9947ffaeb;hp=df8b30a63e5f004c56de81495773bd1f3b2d0acf;hb=3b4151bcb43ec74e0a350c7b93f75531cc8df003;hpb=cf6a8f1453bed5aca0ac32b4038c83ce62b77327

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
index df8b30a63e..0846b2a21b 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Variable.c
@@ -1591,12 +1591,11 @@ UpdateVariable (
   NextVariable->MonotonicCount  = MonotonicCount;
   SetMem (&NextVariable->TimeStamp, sizeof (EFI_TIME), 0);
 
-  if (((Attributes & EFI_VARIABLE_APPEND_WRITE) == 0) && 
-      ((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0)) {
-    CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
-  } else if (
-      ((Attributes & EFI_VARIABLE_APPEND_WRITE) != 0) && 
-      ((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0)) {
+  if (((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0) &&
+        TimeStamp != NULL) {
+    if ((Attributes & EFI_VARIABLE_APPEND_WRITE) == 0) {
+      CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
+    } else {
       //
       // In the case when the EFI_VARIABLE_APPEND_WRITE attribute is set, only
       // when the new TimeStamp value is later than the current timestamp associated
@@ -1605,6 +1604,7 @@ UpdateVariable (
       if (CompareTimeStamp (&Variable->CurrPtr->TimeStamp, TimeStamp)) {
         CopyMem (&NextVariable->TimeStamp, TimeStamp, sizeof (EFI_TIME));
       }
+    }
   }
 
   //